From 7824f60a34da984a838cb61f6aab12c9148ef948 Mon Sep 17 00:00:00 2001
From: Armin Braun <me@obrown.io>
Date: Fri, 26 Apr 2019 10:59:09 +0200
Subject: [PATCH] Simplify Snapshot Resiliency Test (#40930) (#41565)

* Thanks to #39793 dynamic mapping updates don't contain blocking operations anymore so we don't have to manually put the mapping in this test and can keep it a little simpler
---
 .../snapshots/SnapshotResiliencyTests.java    | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java
index 29fdc91a367a3..a30ac9bda5365 100644
--- a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java
+++ b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java
@@ -47,7 +47,6 @@
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.elasticsearch.action.admin.indices.delete.TransportDeleteIndexAction;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingAction;
-import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.action.admin.indices.mapping.put.TransportPutMappingAction;
 import org.elasticsearch.action.admin.indices.shards.IndicesShardStoresAction;
 import org.elasticsearch.action.admin.indices.shards.TransportIndicesShardStoresAction;
@@ -260,29 +259,24 @@ public void testSuccessfulSnapshotAndRestore() {
                                             )));
                                     }));
                                 final AtomicInteger countdown = new AtomicInteger(documents);
-                                masterNode.client.admin().indices().putMapping(
-                                    new PutMappingRequest(index).type("_doc").source("foo", "type=text"),
-                                    assertNoFailureListener(r -> {
-                                            for (int i = 0; i < documents; ++i) {
-                                                masterNode.client.bulk(
-                                                    new BulkRequest().add(new IndexRequest(index).source(
-                                                        Collections.singletonMap("foo", "bar" + i)))
-                                                        .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE),
-                                                    assertNoFailureListener(
-                                                        bulkResponse -> {
-                                                            assertFalse(
-                                                                "Failures in bulkresponse: " + bulkResponse.buildFailureMessage(),
-                                                                bulkResponse.hasFailures());
-                                                            if (countdown.decrementAndGet() == 0) {
-                                                                afterIndexing.run();
-                                                            }
-                                                        }));
-                                            }
-                                            if (documents == 0) {
-                                                afterIndexing.run();
-                                            }
-                                        }
-                                    ));
+                                for (int i = 0; i < documents; ++i) {
+                                    masterNode.client.bulk(
+                                        new BulkRequest().add(new IndexRequest(index).source(
+                                            Collections.singletonMap("foo", "bar" + i)))
+                                            .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE),
+                                        assertNoFailureListener(
+                                            bulkResponse -> {
+                                                assertFalse(
+                                                    "Failures in bulkresponse: " + bulkResponse.buildFailureMessage(),
+                                                    bulkResponse.hasFailures());
+                                                if (countdown.decrementAndGet() == 0) {
+                                                    afterIndexing.run();
+                                                }
+                                            }));
+                                }
+                                if (documents == 0) {
+                                    afterIndexing.run();
+                                }
                             }))));
         runUntil(documentCountVerified::get, TimeUnit.MINUTES.toMillis(5L));
         assertTrue(createdSnapshot.get());