honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt timeouts in UpdateMappingIntegrationIT 

Relates to #37263 and possibly #36916
This commit is contained in:
Yannick Welsch 2019-02-01 08:57:26 +01:00
parent d83c748417
commit 859e2f5bc8
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java
View File

@ -25,10 +25,12 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.client.Client; import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.action.index.MappingUpdatedAction;
import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.metadata.MappingMetaData;
import org.elasticsearch.common.Priority; import org.elasticsearch.common.Priority;
import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.common.xcontent.json.JsonXContent;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
@ -72,15 +74,19 @@ public class UpdateMappingIntegrationIT extends ESIntegTestCase {
.put(MapperService.INDEX_MAPPING_TOTAL_FIELDS_LIMIT_SETTING.getKey(), Long.MAX_VALUE) .put(MapperService.INDEX_MAPPING_TOTAL_FIELDS_LIMIT_SETTING.getKey(), Long.MAX_VALUE)
).execute().actionGet(); ).execute().actionGet();
client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet();
client().admin().cluster().prepareUpdateSettings().setTransientSettings(
Settings.builder().put(MappingUpdatedAction.INDICES_MAPPING_DYNAMIC_TIMEOUT_SETTING.getKey(), TimeValue.timeValueMinutes(5)))
.get();
int recCount = randomIntBetween(200, 600); int recCount = randomIntBetween(20, 200);
List<IndexRequestBuilder> indexRequests = new ArrayList<>(); List<IndexRequestBuilder> indexRequests = new ArrayList<>();
for (int rec = 0; rec < recCount; rec++) { for (int rec = 0; rec < recCount; rec++) {
String type = "type"; String type = "type";
String fieldName = "field_" + type + "_" + rec; String fieldName = "field_" + type + "_" + rec;
indexRequests.add(client().prepareIndex("test", type, Integer.toString(rec)).setSource(fieldName, "some_value")); indexRequests.add(client().prepareIndex("test", type, Integer.toString(rec))
.setTimeout(TimeValue.timeValueMinutes(5)).setSource(fieldName, "some_value"));
} }
indexRandom(true, indexRequests); indexRandom(true, false, indexRequests);
logger.info("checking all the documents are there"); logger.info("checking all the documents are there");
RefreshResponse refreshResponse = client().admin().indices().prepareRefresh().execute().actionGet(); RefreshResponse refreshResponse = client().admin().indices().prepareRefresh().execute().actionGet();
@ -95,6 +101,9 @@ public class UpdateMappingIntegrationIT extends ESIntegTestCase {
String fieldName = "field_" + type + "_" + rec; String fieldName = "field_" + type + "_" + rec;
assertConcreteMappingsOnAll("test", type, fieldName); assertConcreteMappingsOnAll("test", type, fieldName);
} }
client().admin().cluster().prepareUpdateSettings().setTransientSettings(
Settings.builder().putNull(MappingUpdatedAction.INDICES_MAPPING_DYNAMIC_TIMEOUT_SETTING.getKey())).get();
} }
public void testUpdateMappingWithoutType() { public void testUpdateMappingWithoutType() {
@ -224,7 +233,7 @@ public class UpdateMappingIntegrationIT extends ESIntegTestCase {
JsonXContent.contentBuilder().startObject().startObject(typeName) JsonXContent.contentBuilder().startObject().startObject(typeName)
.startObject("properties").startObject(fieldName).field("type", "text").endObject().endObject() .startObject("properties").startObject(fieldName).field("type", "text").endObject().endObject()
.endObject().endObject() .endObject().endObject()
).get(); ).setMasterNodeTimeout(TimeValue.timeValueMinutes(5)).get();
assertThat(response.isAcknowledged(), equalTo(true)); assertThat(response.isAcknowledged(), equalTo(true));
GetMappingsResponse getMappingResponse = client2.admin().indices().prepareGetMappings(indexName).get(); GetMappingsResponse getMappingResponse = client2.admin().indices().prepareGetMappings(indexName).get();