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

change nodeFile to nodeLocation

This commit is contained in:
kimchy 2010-08-29 23:25:23 +03:00
parent 5b5d42445d
commit 8ed54c24bd
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/elasticsearch/src/main/java/org/elasticsearch/env/NodeEnvironment.java vendored
View File

@ -89,7 +89,7 @@ public class NodeEnvironment extends AbstractComponent {
return nodeFile != null && lock != null;
}
public File nodeFile() {
public File nodeLocation() {
if (nodeFile == null || lock == null) {
throw new ElasticSearchIllegalStateException("node is not configured to store local location");
}

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

@ -48,7 +48,6 @@ import org.elasticsearch.env.NodeEnvironment;
import org.elasticsearch.gateway.Gateway;
import org.elasticsearch.gateway.GatewayException;
import org.elasticsearch.index.gateway.local.LocalIndexGatewayModule;
import org.elasticsearch.threadpool.ThreadPool;
import java.io.*;
import java.util.Map;
@ -68,8 +67,6 @@ public class LocalGateway extends AbstractLifecycleComponent<Gateway> implements
private File location;
private final ClusterName clusterName;
private final ClusterService clusterService;
private final NodeEnvironment nodeEnv;
@ -81,9 +78,8 @@ public class LocalGateway extends AbstractLifecycleComponent<Gateway> implements
private volatile LocalGatewayState currentState;
@Inject public LocalGateway(Settings settings, ClusterService clusterService, MetaDataCreateIndexService createIndexService,
NodeEnvironment nodeEnv, ClusterName clusterName, ThreadPool threadPool, TransportNodesListGatewayState listGatewayState) {
NodeEnvironment nodeEnv, TransportNodesListGatewayState listGatewayState) {
super(settings);
this.clusterName = clusterName;
this.clusterService = clusterService;
this.createIndexService = createIndexService;
this.nodeEnv = nodeEnv;
@ -105,7 +101,7 @@ public class LocalGateway extends AbstractLifecycleComponent<Gateway> implements
return;
}
// create the location where the state will be stored
this.location = new File(nodeEnv.nodeFile(), "_state");
this.location = new File(nodeEnv.nodeLocation(), "_state");
this.location.mkdirs();
try {
@ -199,6 +195,7 @@ public class LocalGateway extends AbstractLifecycleComponent<Gateway> implements
}
@Override public void reset() throws Exception {
FileSystemUtils.deleteRecursively(nodeEnv.nodeLocation());
}
@Override public void clusterChanged(final ClusterChangedEvent event) {

2
modules/elasticsearch/src/main/java/org/elasticsearch/index/store/fs/FsIndexStore.java
View File

@ -47,7 +47,7 @@ public abstract class FsIndexStore extends AbstractIndexStore {
public FsIndexStore(Index index, @IndexSettings Settings indexSettings, IndexService indexService, NodeEnvironment nodeEnv) {
super(index, indexSettings, indexService);
if (nodeEnv.hasNodeFile()) {
this.location = new File(new File(nodeEnv.nodeFile(), "indices"), index.name());
this.location = new File(new File(nodeEnv.nodeLocation(), "indices"), index.name());
} else {
this.location = null;
}

2
modules/elasticsearch/src/main/java/org/elasticsearch/index/translog/fs/FsTranslog.java
View File

@ -59,7 +59,7 @@ public class FsTranslog extends AbstractIndexShardComponent implements Translog
@Inject public FsTranslog(ShardId shardId, @IndexSettings Settings indexSettings, NodeEnvironment nodeEnv) {
super(shardId, indexSettings);
this.location = new File(new File(new File(new File(nodeEnv.nodeFile(), "indices"), shardId.index().name()), Integer.toString(shardId.id())), "translog");
this.location = new File(new File(new File(new File(nodeEnv.nodeLocation(), "indices"), shardId.index().name()), Integer.toString(shardId.id())), "translog");
this.location.mkdirs();
this.useStream = componentSettings.getAsBoolean("use_stream", false);
}