|
36 | 36 | import org.elasticsearch.env.NodeEnvironment; |
37 | 37 | import org.elasticsearch.index.Index; |
38 | 38 | import org.elasticsearch.index.IndexSettings; |
| 39 | +import org.elasticsearch.index.MergePolicyConfig; |
39 | 40 | import org.elasticsearch.index.engine.Engine; |
40 | 41 | import org.elasticsearch.index.query.QueryBuilders; |
41 | 42 | import org.elasticsearch.index.shard.ShardId; |
|
46 | 47 | import org.elasticsearch.test.ESIntegTestCase; |
47 | 48 | import org.elasticsearch.test.ESIntegTestCase.ClusterScope; |
48 | 49 | import org.elasticsearch.test.ESIntegTestCase.Scope; |
| 50 | +import org.elasticsearch.test.InternalSettingsPlugin; |
49 | 51 | import org.elasticsearch.test.InternalTestCluster; |
50 | 52 | import org.elasticsearch.test.InternalTestCluster.RestartCallback; |
51 | 53 | import org.elasticsearch.test.store.MockFSIndexStore; |
@@ -81,7 +83,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase { |
81 | 83 |
|
82 | 84 | @Override |
83 | 85 | protected Collection<Class<? extends Plugin>> nodePlugins() { |
84 | | - return Arrays.asList(MockFSIndexStore.TestPlugin.class); |
| 86 | + return Arrays.asList(MockFSIndexStore.TestPlugin.class, InternalSettingsPlugin.class); |
85 | 87 | } |
86 | 88 |
|
87 | 89 | public void testOneNodeRecoverFromGateway() throws Exception { |
@@ -404,8 +406,12 @@ public void testReuseInFileBasedPeerRecovery() throws Exception { |
404 | 406 | .admin() |
405 | 407 | .indices() |
406 | 408 | .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(); |
409 | 415 |
|
410 | 416 | logger.info("--> indexing docs"); |
411 | 417 | int numDocs = randomIntBetween(1, 1024); |
|
0 commit comments