Delete index after each test in elasticsearch tests
Since change I6539845e0 the index is not deleted after each test method
because of a problem where the index was not deleted quickly enough and
the index for the next test could not be created due to the previous one
still existing. The indices are all kept and then only deleted at the
end of the run.
Leaving all the indices results in running out of file descriptors which
results in tests failing when many tests are run in sequence.
Since we now give each test index a unique name, we no longer suffer from
the original problem described above. We can safely attempt to delete the
index and it doesn't matter if it does not get deleted quickly enough and
still exists when the next test is started.
The tests for accounts, groups and projects are not currently affected by
this problem because they have far fewer test methods than the tests for
changes. The same fix is done for those tests anyway to make sure we do
not run into the same problem in future.
Bug: Issue 8816
Change-Id: I1646f5b802dd2d15b974d4c4d75ab337c4c6f462
diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticTestUtils.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticTestUtils.java
index ca9673e..9ac582a 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticTestUtils.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticTestUtils.java
@@ -109,8 +109,36 @@
return new ElasticNodeInfo(node, elasticDir, getHttpPort(node));
}
- public static void deleteAllIndexes(ElasticNodeInfo nodeInfo) {
- nodeInfo.node.client().admin().indices().prepareDelete("_all").execute();
+ public static void deleteAllIndexes(ElasticNodeInfo nodeInfo, String prefix) {
+ Schema<ChangeData> changeSchema = ChangeSchemaDefinitions.INSTANCE.getLatest();
+ nodeInfo
+ .node
+ .client()
+ .admin()
+ .indices()
+ .prepareDelete(String.format("%s%s_%04d", prefix, CHANGES, changeSchema.getVersion()))
+ .execute()
+ .actionGet();
+
+ Schema<AccountState> accountSchema = AccountSchemaDefinitions.INSTANCE.getLatest();
+ nodeInfo
+ .node
+ .client()
+ .admin()
+ .indices()
+ .prepareDelete(String.format("%s%s_%04d", prefix, ACCOUNTS, accountSchema.getVersion()))
+ .execute()
+ .actionGet();
+
+ Schema<AccountGroup> groupSchema = GroupSchemaDefinitions.INSTANCE.getLatest();
+ nodeInfo
+ .node
+ .client()
+ .admin()
+ .indices()
+ .prepareDelete(String.format("%s%s_%04d", prefix, GROUPS, groupSchema.getVersion()))
+ .execute()
+ .actionGet();
}
public static class NodeInfo {
diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryAccountsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryAccountsTest.java
index 6b3ebc5..5765436 100644
--- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryAccountsTest.java
+++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryAccountsTest.java
@@ -22,6 +22,7 @@
import com.google.inject.Injector;
import java.util.concurrent.ExecutionException;
import org.eclipse.jgit.lib.Config;
+import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -46,11 +47,22 @@
}
}
+ private String testName() {
+ return testName.getMethodName().toLowerCase() + "_";
+ }
+
+ @After
+ public void cleanupIndex() {
+ if (nodeInfo != null) {
+ ElasticTestUtils.deleteAllIndexes(nodeInfo, testName());
+ }
+ }
+
@Override
protected Injector createInjector() {
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
- String indicesPrefix = testName.getMethodName().toLowerCase() + "_";
+ String indicesPrefix = testName();
ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix);
ElasticTestUtils.createAllIndexes(nodeInfo, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration));
diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java
index 9ae667c..ee90449 100644
--- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java
+++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java
@@ -24,6 +24,7 @@
import java.util.concurrent.ExecutionException;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.Config;
+import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -53,11 +54,22 @@
}
}
+ private String testName() {
+ return testName.getMethodName().toLowerCase() + "_";
+ }
+
+ @After
+ public void cleanupIndex() {
+ if (nodeInfo != null) {
+ ElasticTestUtils.deleteAllIndexes(nodeInfo, testName());
+ }
+ }
+
@Override
protected Injector createInjector() {
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
- String indicesPrefix = testName.getMethodName().toLowerCase() + "_";
+ String indicesPrefix = testName();
ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix);
ElasticTestUtils.createAllIndexes(nodeInfo, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration));
diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryGroupsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryGroupsTest.java
index c7f7475..b9912d3 100644
--- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryGroupsTest.java
+++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryGroupsTest.java
@@ -22,6 +22,7 @@
import com.google.inject.Injector;
import java.util.concurrent.ExecutionException;
import org.eclipse.jgit.lib.Config;
+import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -46,11 +47,22 @@
}
}
+ private String testName() {
+ return testName.getMethodName().toLowerCase() + "_";
+ }
+
+ @After
+ public void cleanupIndex() {
+ if (nodeInfo != null) {
+ ElasticTestUtils.deleteAllIndexes(nodeInfo, testName());
+ }
+ }
+
@Override
protected Injector createInjector() {
Config elasticsearchConfig = new Config(config);
InMemoryModule.setDefaults(elasticsearchConfig);
- String indicesPrefix = testName.getMethodName().toLowerCase() + "_";
+ String indicesPrefix = testName();
ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix);
ElasticTestUtils.createAllIndexes(nodeInfo, indicesPrefix);
return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration));
