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

more work on Improve cleanup of unused shards when index is completely relocated from (#1101)

This commit is contained in:
kimchy 2011-07-08 01:52:53 +03:00
parent 3a8f198a76
commit 6783b7fe18
1 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
modules/elasticsearch/src/main/java/org/elasticsearch/indices/store/IndicesStore.java
View File

@ -37,7 +37,6 @@ import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.IndicesService;
import java.io.File; import java.io.File;
import java.util.Map;
/** /**
* @author kimchy (shay.banon) * @author kimchy (shay.banon)
@ -76,35 +75,7 @@ public class IndicesStore extends AbstractComponent implements ClusterStateListe
for (IndexRoutingTable indexRoutingTable : routingTable) { for (IndexRoutingTable indexRoutingTable : routingTable) {
IndexService indexService = indicesService.indexService(indexRoutingTable.index()); IndexService indexService = indicesService.indexService(indexRoutingTable.index());
if (indexService == null) { if (indexService == null) {
// not allocated on this node yet... // we handle this later...
// checking if the index was completely relocated to another nodes but left unused shards
for (Map.Entry<Integer, IndexShardRoutingTable> shardEntry : indexRoutingTable.getShards().entrySet()) {
if (indexRoutingTable != null) {
IndexShardRoutingTable indexShardRoutingTable = indexRoutingTable.shard(shardEntry.getKey());
if (indexShardRoutingTable != null) {
boolean shardCanBeDeleted = true;
for (ShardRouting routing : indexShardRoutingTable) {
// The shard is not yet started - we cannot make determination if it's used or not yet
if (!routing.started()) {
shardCanBeDeleted = false;
break;
}
String localNodeId = clusterService.localNode().id();
// Check if shard is active on the current node or is getting relocated to the current node
if (localNodeId.equals(routing.currentNodeId()) || localNodeId.equals(routing.relocatingNodeId())) {
// Shard is used locally - keep it
shardCanBeDeleted = false;
break;
}
}
if (shardCanBeDeleted) {
ShardId shardId = shardEntry.getValue().getShardId();
logger.debug("[{}] deleting shard that is no longer used", shardId);
FileSystemUtils.deleteRecursively(nodeEnv.shardLocation(shardId));
}
}
}
}
continue; continue;
} }
// if the store is not persistent, don't bother trying to check if it can be deleted // if the store is not persistent, don't bother trying to check if it can be deleted
@ -133,9 +104,40 @@ public class IndicesStore extends AbstractComponent implements ClusterStateListe
} }
} }
// do the reverse, and delete dangling indices that might remain on that node // do the reverse, and delete dangling indices / shards that might remain on that node
// this can happen when deleting a closed index, or when a node joins and it has deleted indices // this can happen when deleting a closed index, or when a node joins and it has deleted indices / shards
if (nodeEnv.hasNodeFile()) { if (nodeEnv.hasNodeFile()) {
// delete unused shards for existing indices
for (IndexRoutingTable indexRoutingTable : routingTable) {
IndexService indexService = indicesService.indexService(indexRoutingTable.index());
if (indexService != null) { // allocated, ignore this
continue;
}
for (IndexShardRoutingTable indexShardRoutingTable : indexRoutingTable) {
boolean shardCanBeDeleted = true;
for (ShardRouting shardRouting : indexShardRoutingTable) {
// don't delete a shard that not all instances are active
if (!shardRouting.active()) {
shardCanBeDeleted = false;
break;
}
String localNodeId = clusterService.localNode().id();
// check if shard is active on the current node or is getting relocated to the our node
if (localNodeId.equals(shardRouting.currentNodeId()) || localNodeId.equals(shardRouting.relocatingNodeId())) {
// shard will be used locally - keep it
shardCanBeDeleted = false;
break;
}
}
if (shardCanBeDeleted) {
ShardId shardId = indexShardRoutingTable.shardId();
logger.debug("[{}][{}] deleting shard that is no longer used", shardId.index().name(), shardId.id());
FileSystemUtils.deleteRecursively(nodeEnv.shardLocation(shardId));
}
}
}
// delete indices that are no longer part of the metadata
File[] files = nodeEnv.indicesLocation().listFiles(); File[] files = nodeEnv.indicesLocation().listFiles();
if (files != null) { if (files != null) {
for (File file : files) { for (File file : files) {