Adapt IndexShardIT.testNoOpEngineFactoryTakesPrecedence

elastic · Sep 26, 2018 · 1c3e36f · 1c3e36f
1 parent f28226e
commit 1c3e36f
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java
@@ -816,30 +816,31 @@ public void testGlobalCheckpointListenerTimeout() throws InterruptedException {
      */
     public void testNoOpEngineFactoryTakesPrecedence() throws IOException {
         final String indexName = "closed-index";
-        final Index index = new Index(indexName, UUIDs.randomBase64UUID());
-        final Settings.Builder builder = Settings.builder()
-            .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
-            .put(IndexMetaData.SETTING_INDEX_UUID, index.getUUID());
-
-        final IndexMetaData indexMetaData = new IndexMetaData.Builder(index.getName())
-            .settings(builder.build())
-            .state(IndexMetaData.State.CLOSE)
-            .numberOfShards(1)
-            .numberOfReplicas(0)
-            .build();
+        createIndex(indexName, Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 0).build());
+        ensureGreen();
+
+        client().admin().indices().prepareClose(indexName).get();
 
-        final IndicesService indicesService = getInstanceFromNode(IndicesService.class);
         final ClusterService clusterService = getInstanceFromNode(ClusterService.class);
-        final IndexService indexService = indicesService.createIndex(indexMetaData, Collections.emptyList());
+        final ClusterState clusterState = clusterService.state();
+
+        IndexMetaData indexMetaData = clusterState.metaData().index(indexName);
+        final IndicesService indicesService = getInstanceFromNode(IndicesService.class);
 
-        final ShardId shardId = new ShardId(index, 0);
+        final ShardId shardId = new ShardId(indexMetaData.getIndex(), 0);
         final DiscoveryNode node = clusterService.localNode();
         final ShardRouting routing =
             newShardRouting(shardId, node.getId(), true, ShardRoutingState.INITIALIZING, RecoverySource.EmptyStoreRecoverySource.INSTANCE);
 
-        final IndexShard indexShard = indexService.createShard(routing, id -> {});
-        indexShard.markAsRecovering("store", new RecoveryState(indexShard.routingEntry(), node, null));
-        indexShard.recoverFromStore();
-        assertThat(indexShard.getEngine(), instanceOf(NoOpEngine.class));
+        final IndexService indexService = indicesService.createIndex(indexMetaData, Collections.emptyList());
+        try {
+            final IndexShard indexShard = indexService.createShard(routing, id -> {
+            });
+            indexShard.markAsRecovering("store", new RecoveryState(indexShard.routingEntry(), node, null));
+            indexShard.recoverFromStore();
+            assertThat(indexShard.getEngine(), instanceOf(NoOpEngine.class));
+        } finally {
+            indexService.close("test terminated", true);
+        }
     }
 }