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

if no shards are allocated for a deleted index, then no need to wait for a response

This commit is contained in:
kimchy 2011-02-02 15:28:48 +02:00
parent 4ed82023ce
commit da17be34c1
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java
View File

@ -39,6 +39,7 @@ import org.elasticsearch.common.timer.TimerTask;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.indices.IndexMissingException;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.timer.TimerService; import org.elasticsearch.timer.TimerService;
import java.util.Set; import java.util.Set;
@ -55,15 +56,18 @@ public class MetaDataDeleteIndexService extends AbstractComponent {
private final TimerService timerService; private final TimerService timerService;
private final ThreadPool threadPool;
private final ClusterService clusterService; private final ClusterService clusterService;
private final ShardsAllocation shardsAllocation; private final ShardsAllocation shardsAllocation;
private final NodeIndexDeletedAction nodeIndexDeletedAction; private final NodeIndexDeletedAction nodeIndexDeletedAction;
@Inject public MetaDataDeleteIndexService(Settings settings, TimerService timerService, ClusterService clusterService, ShardsAllocation shardsAllocation, @Inject public MetaDataDeleteIndexService(Settings settings, ThreadPool threadPool, TimerService timerService, ClusterService clusterService, ShardsAllocation shardsAllocation,
NodeIndexDeletedAction nodeIndexDeletedAction) { NodeIndexDeletedAction nodeIndexDeletedAction) {
super(settings); super(settings);
this.threadPool = threadPool;
this.timerService = timerService; this.timerService = timerService;
this.clusterService = clusterService; this.clusterService = clusterService;
this.shardsAllocation = shardsAllocation; this.shardsAllocation = shardsAllocation;
@ -77,7 +81,11 @@ public class MetaDataDeleteIndexService extends AbstractComponent {
try { try {
RoutingTable routingTable = currentState.routingTable(); RoutingTable routingTable = currentState.routingTable();
if (!routingTable.hasIndex(request.index)) { if (!routingTable.hasIndex(request.index)) {
listener.onFailure(new IndexMissingException(new Index(request.index))); threadPool.cached().execute(new Runnable() {
@Override public void run() {
listener.onFailure(new IndexMissingException(new Index(request.index)));
}
});
return currentState; return currentState;
} }
@ -111,27 +119,37 @@ public class MetaDataDeleteIndexService extends AbstractComponent {
} }
} }
} }
final AtomicInteger counter = new AtomicInteger(allocatedNodes.size());
final NodeIndexDeletedAction.Listener nodeIndexDeleteListener = new NodeIndexDeletedAction.Listener() { if (allocatedNodes.isEmpty()) {
@Override public void onNodeIndexDeleted(String index, String nodeId) { // no nodes allocated, don't wait for a response
if (index.equals(request.index)) { threadPool.cached().execute(new Runnable() {
if (counter.decrementAndGet() == 0) { @Override public void run() {
listener.onResponse(new Response(true)); listener.onResponse(new Response(true));
nodeIndexDeletedAction.remove(this); }
});
} else {
final AtomicInteger counter = new AtomicInteger(allocatedNodes.size());
final NodeIndexDeletedAction.Listener nodeIndexDeleteListener = new NodeIndexDeletedAction.Listener() {
@Override public void onNodeIndexDeleted(String index, String nodeId) {
if (index.equals(request.index)) {
if (counter.decrementAndGet() == 0) {
listener.onResponse(new Response(true));
nodeIndexDeletedAction.remove(this);
}
} }
} }
} };
}; nodeIndexDeletedAction.add(nodeIndexDeleteListener);
nodeIndexDeletedAction.add(nodeIndexDeleteListener);
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));
nodeIndexDeletedAction.remove(nodeIndexDeleteListener); nodeIndexDeletedAction.remove(nodeIndexDeleteListener);
} }
}, request.timeout, TimerService.ExecutionType.THREADED); }, request.timeout, TimerService.ExecutionType.THREADED);
listener.timeout = timeoutTask; listener.timeout = timeoutTask;
}
return newClusterStateBuilder().state(currentState).routingResult(routingResult).metaData(newMetaData).blocks(blocks).build(); return newClusterStateBuilder().state(currentState).routingResult(routingResult).metaData(newMetaData).blocks(blocks).build();