Skip to content

Commit

Permalink
Fix docs for MappingUpdatedAction
Browse files Browse the repository at this point in the history
Follow-up to #31140
  • Loading branch information
ywelsch committed Jan 24, 2019
1 parent 8899714 commit 9409706
Showing 1 changed file with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package org.elasticsearch.cluster.action.index;

import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
import org.elasticsearch.action.support.master.MasterNodeRequest;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.IndicesAdminClient;
import org.elasticsearch.common.inject.Inject;
Expand Down Expand Up @@ -78,11 +79,12 @@ public void updateMappingOnMaster(Index index, String type, Mapping mappingUpdat
}

/**
* Update mappings synchronously on the master node, waiting for at most
* {@code timeout}. When this method returns successfully mappings have
* been applied to the master node and propagated to data nodes.
* Update mappings on the master node, waiting for the change to be committed,
* but not for the mapping update to be applied on all nodes. The timeout specified by
* {@code timeout} is the master node timeout ({@link MasterNodeRequest#masterNodeTimeout()}),
* potentially waiting for a master node to be available.
*/
public void updateMappingOnMaster(Index index, String type, Mapping mappingUpdate, TimeValue timeout) {
updateMappingRequest(index, type, mappingUpdate, timeout).get();
public void updateMappingOnMaster(Index index, String type, Mapping mappingUpdate, TimeValue masterNodeTimeout) {
updateMappingRequest(index, type, mappingUpdate, masterNodeTimeout).get();
}
}

0 comments on commit 9409706

Please sign in to comment.