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

Put Mapping: When using a single node and updating a mapping, it is not marked as `acknowledged`, closes #280.

This commit is contained in:
kimchy 2010-07-29 15:21:11 +03:00
parent e955e41a91
commit 4f407e18aa
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
View File

@ -205,28 +205,31 @@ public class MetaDataMappingService extends AbstractComponent {
} }
} }
if (expectedReplies == 0) {
final AtomicInteger counter = new AtomicInteger(expectedReplies); listener.onResponse(new Response(true));
final Set<String> indicesSet = newHashSet(request.indices); } else {
final NodeMappingCreatedAction.Listener nodeMappingListener = new NodeMappingCreatedAction.Listener() { final AtomicInteger counter = new AtomicInteger(expectedReplies);
@Override public void onNodeMappingCreated(NodeMappingCreatedAction.NodeMappingCreatedResponse response) { final Set<String> indicesSet = newHashSet(request.indices);
if (indicesSet.contains(response.index()) && response.type().equals(request.mappingType)) { final NodeMappingCreatedAction.Listener nodeMappingListener = new NodeMappingCreatedAction.Listener() {
if (counter.decrementAndGet() == 0) { @Override public void onNodeMappingCreated(NodeMappingCreatedAction.NodeMappingCreatedResponse response) {
listener.onResponse(new Response(true)); if (indicesSet.contains(response.index()) && response.type().equals(request.mappingType)) {
nodeMappingCreatedAction.remove(this); if (counter.decrementAndGet() == 0) {
listener.onResponse(new Response(true));
nodeMappingCreatedAction.remove(this);
}
} }
} }
} };
}; nodeMappingCreatedAction.add(nodeMappingListener);
nodeMappingCreatedAction.add(nodeMappingListener);
Timeout timeoutTask = timerService.newTimeout(new TimerTask() { Timeout timeoutTask = timerService.newTimeout(new TimerTask() {
@Override public void run(Timeout timeout) throws Exception { @Override public void run(Timeout timeout) throws Exception {
listener.onResponse(new Response(false)); listener.onResponse(new Response(false));
nodeMappingCreatedAction.remove(nodeMappingListener); nodeMappingCreatedAction.remove(nodeMappingListener);
} }
}, request.timeout, TimerService.ExecutionType.THREADED); }, request.timeout, TimerService.ExecutionType.THREADED);
listener.timeout = timeoutTask; listener.timeout = timeoutTask;
}
return newClusterStateBuilder().state(currentState).metaData(builder).build(); return newClusterStateBuilder().state(currentState).metaData(builder).build();