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

Cleanup Integration Tests

This commit is contained in:
Simon Willnauer 2013-09-22 11:59:17 +02:00
parent 4b5935a708
commit 0909055e83
3 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java
View File

@ -39,6 +39,7 @@ import org.elasticsearch.test.AbstractIntegrationTest.Scope;
import org.junit.Test;
import java.io.File;
import java.util.Arrays;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
import static org.hamcrest.Matchers.equalTo;
@ -155,12 +156,13 @@ public class ClusterRerouteTests extends AbstractIntegrationTest {
client().prepareIndex("test", "type", "1").setSource("field", "value").setRefresh(true).execute().actionGet();
logger.info("--> closing all nodes");
File shardLocation = cluster().getInstance(NodeEnvironment.class).shardLocations(new ShardId("test", 0))[0];
File[] shardLocation = cluster().getInstance(NodeEnvironment.class, node_1).shardLocations(new ShardId("test", 0));
assertThat(FileSystemUtils.exists(shardLocation), equalTo(true)); // make sure the data is there!
cluster().closeNonSharedNodes(false); // don't wipe data directories the index needs to be there!
cluster().closeAllNodesAndReset();
logger.info("--> deleting the shard data [{}] ", shardLocation);
FileSystemUtils.deleteRecursively(shardLocation);
logger.info("--> deleting the shard data [{}] ", Arrays.toString(shardLocation));
assertThat(FileSystemUtils.exists(shardLocation), equalTo(true)); // verify again after cluster was shut down
assertThat(FileSystemUtils.deleteRecursively(shardLocation), equalTo(true));
logger.info("--> starting nodes back, will not allocate the shard since it has no data, but the index will be there");
node_1 = cluster().startNode(commonSettings);

2
src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java
View File

@ -64,7 +64,7 @@ public class SearchPreferenceTests extends AbstractIntegrationTest {
client().prepareIndex("test", "type1").setSource("field1", "value1").execute().actionGet();
client().admin().indices().prepareRefresh().execute().actionGet();
final Client client = client();
final Client client = cluster().smartClient();
SearchResponse searchResponse = client.prepareSearch("test").setQuery(matchAllQuery()).execute().actionGet();
String firstNodeId = searchResponse.getHits().getAt(0).shard().nodeId();
searchResponse = client.prepareSearch("test").setQuery(matchAllQuery()).execute().actionGet();

52
src/test/java/org/elasticsearch/test/TestCluster.java
View File

@ -51,6 +51,7 @@ import org.elasticsearch.index.store.mock.MockFSIndexStoreModule;
import org.elasticsearch.node.Node;
import org.elasticsearch.node.internal.InternalNode;
import org.elasticsearch.transport.TransportService;
import org.junit.Assert;
import java.io.Closeable;
import java.io.File;
@ -248,7 +249,8 @@ public class TestCluster implements Closeable, Iterable<Client> {
if (randomNodeAndClient != null) {
return randomNodeAndClient.nodeClient(); // ensure node client master is requested
}
return null;
Assert.fail("No master client found");
return null; // can't happen
}
public synchronized Client nonMasterClient() {
@ -257,7 +259,8 @@ public class TestCluster implements Closeable, Iterable<Client> {
if (randomNodeAndClient != null) {
return randomNodeAndClient.nodeClient(); // ensure node client non-master is requested
}
return null;
Assert.fail("No non-master client found");
return null; // can't happen
}
public synchronized Client clientNodeClient() {
@ -266,7 +269,17 @@ public class TestCluster implements Closeable, Iterable<Client> {
if (randomNodeAndClient != null) {
return randomNodeAndClient.client(random);
}
return null;
startNodeClient(ImmutableSettings.EMPTY);
return getRandomNodeAndClient(new ClientNodePredicate()).client(random);
}
public synchronized Client smartClient() {
NodeAndClient randomNodeAndClient = getRandomNodeAndClient();
if (randomNodeAndClient != null) {
return randomNodeAndClient.nodeClient();
}
Assert.fail("No smart client found");
return null; // can't happen
}
public synchronized Client client(final Predicate<Settings> filterPredicate) {
@ -351,12 +364,15 @@ public class TestCluster implements Closeable, Iterable<Client> {
client.close();
client = null;
}
if (nodeClient != null) {
nodeClient.close();
nodeClient = null;
}
}
@Override
public void close() {
closed.set(true);
if (client != null) {
client.close();
client = null;
@ -391,31 +407,47 @@ public class TestCluster implements Closeable, Iterable<Client> {
public Client client(Node node, String clusterName, Random random) {
TransportAddress addr = ((InternalNode) node).injector().getInstance(TransportService.class).boundAddress().publishAddress();
TransportClient client = new TransportClient(settingsBuilder().put("client.transport.nodes_sampler_interval", "1s")
.put("name", "transport_client_" + node.settings().get("name"))
.put("cluster.name", clusterName).put("client.transport.sniff", sniff).build());
client.addTransportAddress(addr);
return client;
}
}
public static class RandomClientFactory extends ClientFactory {
public class RandomClientFactory extends ClientFactory {
@Override
public Client client(Node node, String clusterName, Random random) {
switch (random.nextInt(10)) {
case 5: // disabled for now - will re-enable once tests stabelize
// if (logger.isDebugEnabled()) {
// logger.debug("Using transport client for node [{}] sniff: [{}]", node.settings().get("name"), false);
// }
// return TransportClientFactory.NO_SNIFF_CLIENT_FACTORY.client(node, clusterName, random);
case 3:
// if (logger.isDebugEnabled()) {
// logger.debug("Using transport client for node [{}] sniff: [{}]", node.settings().get("name"), true);
// }
// return TransportClientFactory.SNIFF_CLIENT_FACTORY.client(node, clusterName, random);
default:
if (logger.isDebugEnabled()) {
logger.debug("Using node client for node [{}]", node.settings().get("name"));
}
return node.client();
}
}
}
public synchronized void beforeTest(Random random) {
reset(random, true);
}
private synchronized void reset(Random random, boolean wipeData) {
this.random = new Random(random.nextLong());
resetClients(); /* reset all clients - each test gets it's own client based on the Random instance created above. */
wipeDataDirectories();
if (wipeData) {
wipeDataDirectories();
}
if (nextNodeId.get() == sharedNodesSeeds.length && nodes.size() == sharedNodesSeeds.length) {
logger.debug("Cluster hasn't changed - moving out - nodes: [{}] nextNodeId: [{}] numSharedNodes: [{}]", nodes.keySet(), nextNodeId.get(), sharedNodesSeeds.length);
return;
@ -467,6 +499,8 @@ public class TestCluster implements Closeable, Iterable<Client> {
public synchronized void afterTest() {
wipeDataDirectories();
resetClients(); /* reset all clients - each test gets it's own client based on the Random instance created above. */
}
private void resetClients() {
@ -660,8 +694,8 @@ public class TestCluster implements Closeable, Iterable<Client> {
}
}
public void closeAllNodesAndReset() {
beforeTest(random);
public void closeNonSharedNodes(boolean wipeData) {
reset(random, wipeData);
}