Fix SearchWhileRelocatingIT so that the type of the mapping matches the type of documents.

Author: jpountz

core/src/main/java/org/elasticsearch/index/mapper/MapperService.java

@@ -392,7 +392,7 @@ protected void checkMappersCompatibility(String type, Collection<ObjectMapper> o
 
         for (FieldMapper fieldMapper : fieldMappers) {
             if (fullPathObjectMappers.containsKey(fieldMapper.name())) {
-                throw new IllegalArgumentException("Field [{}] is defined as a field in mapping [" + fieldMapper.name() + "] but this name is already used for an object in other types");
+                throw new IllegalArgumentException("Field [" + fieldMapper.name() + "] is defined as a field in mapping [" + type + "] but this name is already used for an object in other types");
             }
         }
 

core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java

@@ -66,7 +66,7 @@ private void testSearchAndRelocateConcurrently(final int numberOfReplicas) throw
         final int numShards = between(1, 20);
         client().admin().indices().prepareCreate("test")
                 .setSettings(settingsBuilder().put("index.number_of_shards", numShards).put("index.number_of_replicas", numberOfReplicas))
-                .addMapping("type1", "loc", "type=geo_point", "test", "type=string").execute().actionGet();
+                .addMapping("type", "loc", "type=geo_point", "test", "type=string").execute().actionGet();
         ensureGreen();
         List<IndexRequestBuilder> indexBuilders = new ArrayList<>();
         final int numDocs = between(10, 20);