File tree Expand file tree Collapse file tree 5 files changed +17
-16
lines changed
rest-api-spec/src/main/resources/rest-api-spec/test/indices.split
main/java/org/elasticsearch/index/store
test/java/org/elasticsearch/action/admin/indices/create Expand file tree Collapse file tree 5 files changed +17
-16
lines changed Original file line number Diff line number Diff line change @@ -107,11 +107,8 @@ setup:
107107---
108108" Split from 1 to N " :
109109 - skip :
110- # when re-enabling uncomment the below skips
111- version : " all"
112- reason : " AwaitsFix'ing, see https://github.com/elastic/elasticsearch/issues/30503"
113- # version: " - 6.3.99"
114- # reason: expects warnings that pre-6.4.0 will not send
110+ version : " - 6.99.99"
111+ reason : Automatic preparation for splitting was added in 7.0.0
115112 features : " warnings"
116113 - do :
117114 indices.create :
Original file line number Diff line number Diff line change 11---
22" Split index ignores target template mapping " :
33 - skip :
4- # when re-enabling uncomment the below skips
5- version : " all"
6- reason : " AwaitsFix'ing, see https://github.com/elastic/elasticsearch/issues/30503"
7- # version: " - 6.3.99"
8- # reason: expects warnings that pre-6.4.0 will not send
4+ version : " - 6.3.99"
5+ reason : expects warnings that pre-6.4.0 will not send
96 features : " warnings"
107
118 # create index
Original file line number Diff line number Diff line change @@ -731,13 +731,13 @@ static final class StoreDirectory extends FilterDirectory {
731731
732732 private final Logger deletesLogger ;
733733
734- StoreDirectory (Directory delegateDirectory , Logger deletesLogger ) throws IOException {
734+ StoreDirectory (Directory delegateDirectory , Logger deletesLogger ) {
735735 super (delegateDirectory );
736736 this .deletesLogger = deletesLogger ;
737737 }
738738
739739 @ Override
740- public void close () throws IOException {
740+ public void close () {
741741 assert false : "Nobody should close this directory except of the Store itself" ;
742742 }
743743
@@ -759,6 +759,17 @@ private void innerClose() throws IOException {
759759 public String toString () {
760760 return "store(" + in .toString () + ")" ;
761761 }
762+
763+ @ Override
764+ public boolean checkPendingDeletions () throws IOException {
765+ if (super .checkPendingDeletions ()) {
766+ deletesLogger .warn ("directory has still pending deletes" );
767+ }
768+ // we skip this check since our IW usage always goes forward.
769+ // we still might run into situations where we have pending deletes ie. in shrink / split case
770+ // and that will cause issues on windows since we open multiple IW instance one after another during the split/shrink recovery
771+ return false ;
772+ }
762773 }
763774
764775 /**
Original file line number Diff line number Diff line change 2323import org .apache .lucene .search .SortField ;
2424import org .apache .lucene .search .SortedSetSelector ;
2525import org .apache .lucene .search .SortedSetSortField ;
26- import org .apache .lucene .util .LuceneTestCase .AwaitsFix ;
2726import org .elasticsearch .Version ;
2827import org .elasticsearch .action .admin .cluster .reroute .ClusterRerouteResponse ;
2928import org .elasticsearch .action .admin .cluster .state .ClusterStateRequest ;
7776import static org .hamcrest .Matchers .equalTo ;
7877import static org .hamcrest .Matchers .greaterThanOrEqualTo ;
7978
80- @ AwaitsFix (bugUrl = "https://github.com/elastic/elasticsearch/issues/30416" )
8179public class ShrinkIndexIT extends ESIntegTestCase {
8280
8381 @ Override
Original file line number Diff line number Diff line change 2424import org .apache .lucene .search .SortedSetSelector ;
2525import org .apache .lucene .search .SortedSetSortField ;
2626import org .apache .lucene .search .join .ScoreMode ;
27- import org .apache .lucene .util .LuceneTestCase ;
2827import org .elasticsearch .Version ;
2928import org .elasticsearch .action .admin .cluster .state .ClusterStateRequest ;
3029import org .elasticsearch .action .admin .cluster .state .ClusterStateResponse ;
8180import static org .hamcrest .Matchers .greaterThanOrEqualTo ;
8281
8382
84- @ LuceneTestCase .AwaitsFix (bugUrl = "https://github.com/elastic/elasticsearch/issues/30416" )
8583public class SplitIndexIT extends ESIntegTestCase {
8684
8785 @ Override
You can’t perform that action at this time.
0 commit comments