Skip to content

Commit 36ddca7

Browse files
committed
Disable merges in testReuseInFileBasedPeerRecovery
The test assumes lucene files don't change. Closes #35772
1 parent 74aca75 commit 36ddca7

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

server/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import org.elasticsearch.env.NodeEnvironment;
3737
import org.elasticsearch.index.Index;
3838
import org.elasticsearch.index.IndexSettings;
39+
import org.elasticsearch.index.MergePolicyConfig;
3940
import org.elasticsearch.index.engine.Engine;
4041
import org.elasticsearch.index.query.QueryBuilders;
4142
import org.elasticsearch.index.shard.ShardId;
@@ -46,6 +47,7 @@
4647
import org.elasticsearch.test.ESIntegTestCase;
4748
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
4849
import org.elasticsearch.test.ESIntegTestCase.Scope;
50+
import org.elasticsearch.test.InternalSettingsPlugin;
4951
import org.elasticsearch.test.InternalTestCluster;
5052
import org.elasticsearch.test.InternalTestCluster.RestartCallback;
5153
import org.elasticsearch.test.store.MockFSIndexStore;
@@ -81,7 +83,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
8183

8284
@Override
8385
protected Collection<Class<? extends Plugin>> nodePlugins() {
84-
return Arrays.asList(MockFSIndexStore.TestPlugin.class);
86+
return Arrays.asList(MockFSIndexStore.TestPlugin.class, InternalSettingsPlugin.class);
8587
}
8688

8789
public void testOneNodeRecoverFromGateway() throws Exception {
@@ -404,8 +406,12 @@ public void testReuseInFileBasedPeerRecovery() throws Exception {
404406
.admin()
405407
.indices()
406408
.prepareCreate("test")
407-
.setSettings(Settings.builder().put("number_of_shards", 1).put("number_of_replicas", 1))
408-
.get();
409+
.setSettings(Settings.builder()
410+
.put("number_of_shards", 1)
411+
.put("number_of_replicas", 1)
412+
// disable merges to keep segments the same
413+
.put(MergePolicyConfig.INDEX_MERGE_ENABLED, "false")
414+
).get();
409415

410416
logger.info("--> indexing docs");
411417
int numDocs = randomIntBetween(1, 1024);

0 commit comments

Comments
 (0)