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

[GATEWAY] Remove _state directory if index has been deleted 

Today we try to delete the index directory if all shard locks have been
acquired. Yet, if this fails due to still running recoveries etc. We might
re-import the index as dangeling which also can happen if the node is restarted.
In contrast to the shard direcotries we can safely delete the metastate which is used
to import dangling indices while leaving the shard directories untouched.
This commit is contained in:
Simon Willnauer 2014-11-22 21:47:48 +01:00
parent fda1576d55
commit 043b37d932
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/elasticsearch/gateway/local/state/meta/LocalGatewayMetaState.java
View File

@ -53,6 +53,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -248,7 +249,9 @@ public class LocalGatewayMetaState extends AbstractComponent implements ClusterS
logger.debug("[{}] deleting index that is no longer part of the metadata (indices: [{}])", current.index(), newMetaData.indices().keys());
if (nodeEnv.hasNodeFile()) {
try {
nodeEnv.deleteIndexDirectorySafe(new Index(current.index()));
final Index idx = new Index(current.index());
MetaDataStateFormat.deleteMetaState(nodeEnv.indexPaths(idx));
nodeEnv.deleteIndexDirectorySafe(idx);
} catch (LockObtainFailedException ex) {
logger.debug("[{}] failed to delete index - at least one shards is still locked", ex, current.index());
} catch (Exception ex) {
@ -287,8 +290,8 @@ public class LocalGatewayMetaState extends AbstractComponent implements ClusterS
continue;
}
final IndexMetaData indexMetaData = loadIndexState(indexName);
final Index index = new Index(indexName);
if (indexMetaData != null) {
final Index index = new Index(indexName);
try {
// the index deletion might not have worked due to shards still being locked
// we have three cases here:
@ -313,7 +316,7 @@ public class LocalGatewayMetaState extends AbstractComponent implements ClusterS
} else if (danglingTimeout.millis() == 0) {
logger.info("[{}] dangling index, exists on local file system, but not in cluster metadata, timeout set to 0, deleting now", indexName);
try {
nodeEnv.deleteIndexDirectorySafe(new Index(indexName));
nodeEnv.deleteIndexDirectorySafe(index);
} catch (LockObtainFailedException ex) {
logger.debug("[{}] failed to delete index - at least one shards is still locked", ex, indexName);
} catch (Exception ex) {
@ -321,7 +324,7 @@ public class LocalGatewayMetaState extends AbstractComponent implements ClusterS
}
} else {
logger.info("[{}] dangling index, exists on local file system, but not in cluster metadata, scheduling to delete in [{}], auto import to cluster state [{}]", indexName, danglingTimeout, autoImportDangled);
danglingIndices.put(indexName, new DanglingIndex(indexName, threadPool.schedule(danglingTimeout, ThreadPool.Names.SAME, new RemoveDanglingIndex(indexName))));
danglingIndices.put(indexName, new DanglingIndex(indexName, threadPool.schedule(danglingTimeout, ThreadPool.Names.SAME, new RemoveDanglingIndex(index))));
}
}
}
@ -603,23 +606,25 @@ public class LocalGatewayMetaState extends AbstractComponent implements ClusterS
class RemoveDanglingIndex implements Runnable {
private final String index;
private final Index index;
RemoveDanglingIndex(String index) {
RemoveDanglingIndex(Index index) {
this.index = index;
}
@Override
public void run() {
synchronized (danglingMutex) {
DanglingIndex remove = danglingIndices.remove(index);
DanglingIndex remove = danglingIndices.remove(index.name());
// no longer there...
if (remove == null) {
return;
}
logger.warn("[{}] deleting dangling index", index);
try {
nodeEnv.deleteIndexDirectorySafe(new Index(index));
MetaDataStateFormat.deleteMetaState(nodeEnv.indexPaths(index));
nodeEnv.deleteIndexDirectorySafe(index);
} catch (Exception ex) {
logger.debug("failed to delete dangling index", ex);
}

12
src/main/java/org/elasticsearch/gateway/local/state/meta/MetaDataStateFormat.java
View File

@ -336,4 +336,16 @@ public abstract class MetaDataStateFormat<T> {
}
}
/**
* Deletes all meta state directories recursively for the given data locations
* @param dataLocations the data location to delete
*/
public static void deleteMetaState(Path... dataLocations) throws IOException {
Path[] stateDirectories = new Path[dataLocations.length];
for (int i = 0; i < dataLocations.length; i++) {
stateDirectories[i] = dataLocations[i].resolve(STATE_DIR_NAME);
}
IOUtils.rm(stateDirectories);
}
}