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

don't clear gateways in reroute test 

- also remove test logging from percolator
This commit is contained in:
Shay Banon 2013-09-21 01:55:11 +02:00
parent 52e9e753e6
commit c6eebf0515
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,11 +45,11 @@ import static org.hamcrest.Matchers.equalTo;
/** /**
*/ */
@ClusterScope(scope=Scope.TEST, numNodes=0) @ClusterScope(scope = Scope.TEST, numNodes = 0)
public class ClusterRerouteTests extends AbstractIntegrationTest { public class ClusterRerouteTests extends AbstractIntegrationTest {
private final ESLogger logger = Loggers.getLogger(ClusterRerouteTests.class); private final ESLogger logger = Loggers.getLogger(ClusterRerouteTests.class);
@Test @Test
public void rerouteWithCommands() throws Exception { public void rerouteWithCommands() throws Exception {
@ -156,8 +156,7 @@ public class ClusterRerouteTests extends AbstractIntegrationTest {
logger.info("--> closing all nodes"); logger.info("--> closing all nodes");
File shardLocation = cluster().getInstance(NodeEnvironment.class).shardLocations(new ShardId("test", 0))[0]; File shardLocation = cluster().getInstance(NodeEnvironment.class).shardLocations(new ShardId("test", 0))[0];
cluster().resetAllGateways();
cluster().closeAllNodesAndReset(); cluster().closeAllNodesAndReset();
logger.info("--> deleting the shard data [{}] ", shardLocation); logger.info("--> deleting the shard data [{}] ", shardLocation);

9
src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java
View File

@ -36,7 +36,6 @@ import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.env.NodeEnvironment;
import org.elasticsearch.gateway.Gateway; import org.elasticsearch.gateway.Gateway;
import org.elasticsearch.junit.annotations.TestLogging;
import org.elasticsearch.node.internal.InternalNode; import org.elasticsearch.node.internal.InternalNode;
import org.elasticsearch.test.AbstractNodesTests; import org.elasticsearch.test.AbstractNodesTests;
import org.junit.After; import org.junit.After;
@ -70,8 +69,7 @@ public class RecoveryPercolatorTests extends AbstractNodesTests {
} }
closeAllNodes(); closeAllNodes();
} }
@Override @Override
protected Settings getClassDefaultSettings() { protected Settings getClassDefaultSettings() {
@ -141,7 +139,7 @@ public class RecoveryPercolatorTests extends AbstractNodesTests {
Client client = client("node1"); Client client = client("node1");
client.admin().indices().prepareCreate("test") client.admin().indices().prepareCreate("test")
.setSettings(settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet(); .setSettings(settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
logger.info("--> register a query"); logger.info("--> register a query");
client.prepareIndex("test", "_percolator", "kuku") client.prepareIndex("test", "_percolator", "kuku")
@ -272,14 +270,11 @@ public class RecoveryPercolatorTests extends AbstractNodesTests {
@Test @Test
@Slow @Slow
@TestLogging("action.support.broadcast:TRACE")
public void testSinglePercolator_recovery() throws Exception { public void testSinglePercolator_recovery() throws Exception {
percolatorRecovery(false); percolatorRecovery(false);
} }
@Test @Test
// Need to omit org.elast
@TestLogging("action.percolate:TRACE")
@Slow @Slow
public void testMultiPercolator_recovery() throws Exception { public void testMultiPercolator_recovery() throws Exception {
percolatorRecovery(true); percolatorRecovery(true);