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

only remove shards if they have been started on all other nodes

This commit is contained in:
kimchy 2011-04-14 01:12:37 +03:00
parent 22b5e7ded8
commit 65fde3e71e
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/elasticsearch/src/main/java/org/elasticsearch/gateway/local/LocalGateway.java
View File

@ -25,10 +25,7 @@ import org.elasticsearch.cluster.ClusterChangedEvent;
import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateListener; import org.elasticsearch.cluster.ClusterStateListener;
import org.elasticsearch.cluster.routing.IndexRoutingTable; import org.elasticsearch.cluster.routing.*;
import org.elasticsearch.cluster.routing.IndexShardRoutingTable;
import org.elasticsearch.cluster.routing.MutableShardRouting;
import org.elasticsearch.cluster.routing.RoutingNode;
import org.elasticsearch.common.collect.Sets; import org.elasticsearch.common.collect.Sets;
import org.elasticsearch.common.component.AbstractLifecycleComponent; import org.elasticsearch.common.component.AbstractLifecycleComponent;
import org.elasticsearch.common.compress.lzf.LZF; import org.elasticsearch.common.compress.lzf.LZF;
@ -178,10 +175,10 @@ public class LocalGateway extends AbstractLifecycleComponent<Gateway> implements
return; return;
} }
// we only write the local metadata if this is a possible master node, the metadata has changed, and // we only write the local metadata if this is a possible master node
// we don't have a NO_MASTER block (in which case, the routing is cleaned, and we don't want to override what // currently, we always write the metadata, since we want to keep it in sync with the latest version, but
// we have now, since it might be needed when later on performing full state recovery) // we need to think of a better way to not persist it when nothing changed
if (event.state().nodes().localNode().masterNode() && event.metaDataChanged()) { if (event.state().nodes().localNode().masterNode()) {
executor.execute(new Runnable() { executor.execute(new Runnable() {
@Override public void run() { @Override public void run() {
LocalGatewayMetaState.Builder builder = LocalGatewayMetaState.builder(); LocalGatewayMetaState.Builder builder = LocalGatewayMetaState.builder();
@ -245,7 +242,7 @@ public class LocalGateway extends AbstractLifecycleComponent<Gateway> implements
// so they won't get removed (we want to keep the fact that those shards are allocated on this node if needed) // so they won't get removed (we want to keep the fact that those shards are allocated on this node if needed)
for (IndexRoutingTable indexRoutingTable : event.state().routingTable()) { for (IndexRoutingTable indexRoutingTable : event.state().routingTable()) {
for (IndexShardRoutingTable indexShardRoutingTable : indexRoutingTable) { for (IndexShardRoutingTable indexShardRoutingTable : indexRoutingTable) {
if (indexShardRoutingTable.primaryShard().active()) { if (indexShardRoutingTable.countWithState(ShardRoutingState.STARTED) == indexShardRoutingTable.size()) {
builder.remove(indexShardRoutingTable.shardId()); builder.remove(indexShardRoutingTable.shardId());
} }
} }