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

Mapping metadata not restored from gateway on server restart, closes #57

This commit is contained in:
kimchy 2010-03-12 18:22:20 +02:00
parent 65ed582a90
commit 4e1a1f3437
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java
View File

@ -89,6 +89,10 @@ public class IndexMetaData {
return mappings; return mappings;
} }
public String mapping(String mappingType) {
return mappings.get(mappingType);
}
public static Builder newIndexMetaDataBuilder(String index) { public static Builder newIndexMetaDataBuilder(String index) {
return new Builder(index); return new Builder(index);
} }

10
modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayService.java
View File

@ -32,6 +32,7 @@ import org.elasticsearch.util.component.LifecycleComponent;
import org.elasticsearch.util.concurrent.DynamicExecutors; import org.elasticsearch.util.concurrent.DynamicExecutors;
import org.elasticsearch.util.settings.Settings; import org.elasticsearch.util.settings.Settings;
import java.util.Map;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -162,10 +163,17 @@ public class GatewayService extends AbstractComponent implements ClusterStateLis
threadPool.execute(new Runnable() { threadPool.execute(new Runnable() {
@Override public void run() { @Override public void run() {
try { try {
metaDataService.createIndex(indexMetaData.index(), indexMetaData.settings(), timeValueMillis(10)); metaDataService.createIndex(indexMetaData.index(), indexMetaData.settings(), timeValueMillis(500));
} catch (Exception e) { } catch (Exception e) {
logger.error("Failed to create index [" + indexMetaData.index() + "]", e); logger.error("Failed to create index [" + indexMetaData.index() + "]", e);
} }
for (Map.Entry<String, String> entry : indexMetaData.mappings().entrySet()) {
try {
metaDataService.putMapping(new String[]{indexMetaData.index()}, entry.getKey(), entry.getValue(), true, timeValueMillis(10));
} catch (Exception e) {
logger.error("Failed to put mapping [" + entry.getKey() + "] for index [" + indexMetaData.index() + "]", e);
}
}
} }
}); });
} }

20
modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/AbstractSimpleIndexGatewayTests.java
View File

@ -19,6 +19,8 @@
package org.elasticsearch.test.integration.gateway; package org.elasticsearch.test.integration.gateway;
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.client.Requests; import org.elasticsearch.client.Requests;
import org.elasticsearch.gateway.Gateway; import org.elasticsearch.gateway.Gateway;
@ -57,6 +59,16 @@ public abstract class AbstractSimpleIndexGatewayTests extends AbstractServersTes
logger.info("Creating index [{}]", "test"); logger.info("Creating index [{}]", "test");
client("server1").admin().indices().create(createIndexRequest("test")).actionGet(); client("server1").admin().indices().create(createIndexRequest("test")).actionGet();
// create a mapping
PutMappingResponse putMappingResponse = client("server1").admin().indices().putMapping(putMappingRequest("test").type("type1")
.mappingSource(mappingSource())).actionGet();
assertThat(putMappingResponse.acknowledged(), equalTo(true));
// verify that mapping is there
ClusterStateResponse clusterState = client("server1").admin().cluster().state(clusterState()).actionGet();
assertThat(clusterState.state().metaData().index("test").mapping("type1"), notNullValue());
// create two and delete the first // create two and delete the first
logger.info("Indexing #1"); logger.info("Indexing #1");
client("server1").index(Requests.indexRequest("test").type("type1").id("1").source(source("1", "test"))).actionGet(); client("server1").index(Requests.indexRequest("test").type("type1").id("1").source(source("1", "test"))).actionGet();
@ -79,6 +91,10 @@ public abstract class AbstractSimpleIndexGatewayTests extends AbstractServersTes
startServer("server1"); startServer("server1");
Thread.sleep(1000); Thread.sleep(1000);
// verify that mapping is there
clusterState = client("server1").admin().cluster().state(clusterState()).actionGet();
assertThat(clusterState.state().metaData().index("test").mapping("type1"), notNullValue());
logger.info("Getting #1, should not exists"); logger.info("Getting #1, should not exists");
GetResponse getResponse = client("server1").get(getRequest("test").type("type1").id("1")).actionGet(); GetResponse getResponse = client("server1").get(getRequest("test").type("type1").id("1")).actionGet();
assertThat(getResponse.exists(), equalTo(false)); assertThat(getResponse.exists(), equalTo(false));
@ -140,6 +156,10 @@ public abstract class AbstractSimpleIndexGatewayTests extends AbstractServersTes
assertThat(getResponse.sourceAsString(), equalTo(source("3", "test"))); assertThat(getResponse.sourceAsString(), equalTo(source("3", "test")));
} }
private String mappingSource() {
return "{ type1 : { properties : { name : { type : \"string\" } } } }";
}
private String source(String id, String nameValue) { private String source(String id, String nameValue) {
return "{ type1 : { \"id\" : \"" + id + "\", \"name\" : \"" + nameValue + "\" } }"; return "{ type1 : { \"id\" : \"" + id + "\", \"name\" : \"" + nameValue + "\" } }";
} }