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

Don't use TransportClient on FullClusterRestartTests 

There seems to be an issue with this test since it shuts down random
nodes and TransportClients seem to be confused due to that. For
now we disable them to figure out if this is the cause of the sporadic
timeouts.
This commit is contained in:
Simon Willnauer 2013-10-25 22:04:44 +02:00
parent b0b3748cae
commit 2255ecc980
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java
View File

@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo;
/**
*
*/
@ClusterScope(scope=Scope.TEST, numNodes = 0)
@ClusterScope(scope=Scope.TEST, numNodes = 0, transportClientRatio = 0.0)
public class FullRollingRestartTests extends AbstractIntegrationTest {
@Test

16
src/test/java/org/elasticsearch/test/AbstractIntegrationTest.java
View File

@ -136,7 +136,7 @@ public abstract class AbstractIntegrationTest extends ElasticsearchTestCase {
default:
assert false : "Unknonw Scope: [" + currentClusterScope + "]";
}
currentCluster.beforeTest(getRandom(), Double.isNaN(TRANSPORT_CLIENT_RATIO) ? randomDouble() : TRANSPORT_CLIENT_RATIO);
currentCluster.beforeTest(getRandom(), getPerTestTransportClientRatio());
wipeIndices();
wipeTemplates();
randomIndexTemplate();
@ -683,6 +683,7 @@ public abstract class AbstractIntegrationTest extends ElasticsearchTestCase {
public @interface ClusterScope {
Scope scope() default Scope.GLOBAL;
int numNodes() default -1;
double transportClientRatio() default -1;
}
private static long clusterSeed() {
@ -701,4 +702,17 @@ public abstract class AbstractIntegrationTest extends ElasticsearchTestCase {
return Double.parseDouble(property);
}
private double getPerTestTransportClientRatio() {
final ClusterScope annotation = getAnnotation(this.getClass());
double perTestRatio = -1;
if (annotation != null) {
perTestRatio = annotation.transportClientRatio();
}
if (perTestRatio == -1) {
return Double.isNaN(TRANSPORT_CLIENT_RATIO) ? randomDouble() : TRANSPORT_CLIENT_RATIO;
}
assert perTestRatio >= 0.0 && perTestRatio <= 1.0;
return perTestRatio;
}
}