commit b9d00d08759f03f921599eb59e4c78ff0095ab06
author David Pursehouse <dpursehouse@collab.net> Mon Dec 03 21:27:04 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Tue Dec 04 08:32:37 2018 +0900
tree 50c0fb677f9cec03f7d92bafa40a69860031fbca
parent 3a86708875cbc3840ebb9b70d6eb08e3ba82db1e

ElasticV7QueryChangesTest: Close indices after test

For each test method, new indices are created with a unique name based
on the test method name. This results in 3 indices (i.e. one each for
accounts, changes and groups) for each test method that is run, which
in turn results in the number of allocated shards increasing.

In Elasticsearch 7.0 a shard limit is introduced [1] which so far only
causes a warning. However in a future version (not clear if this means
the final 7.0 release or a subsequent one) the limit will be enforced
and result in an error.

After each test, close the indices that were created. This results in
the shards being deallocated, and prevents exceeding the limit.

[1] https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-7.0.html#_cluster_wide_shard_soft_limit

Bug: Issue 10120
Change-Id: I6644cf9ee84a6133005d07c2310761707a74b96c

gerrit-elasticsearch/BUILD

diff --git a/gerrit-elasticsearch/BUILD b/gerrit-elasticsearch/BUILD
index b91419a..ce474cc 100644
--- a/gerrit-elasticsearch/BUILD
+++ b/gerrit-elasticsearch/BUILD
@@ -101,7 +101,10 @@
     size = "large",
     srcs = [src],
     tags = ELASTICSEARCH_TAGS,
-    deps = ELASTICSEARCH_DEPS,
+    deps = ELASTICSEARCH_DEPS + [
+        "//lib/httpcomponents:httpasyncclient",
+        "//lib/httpcomponents:httpclient",
+    ],
 ) for name, src in ELASTICSEARCH_TESTS_V7.items()]
 
 junit_tests(

gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java

diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
index 6d3bca2..f46364e 100644
--- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
+++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
@@ -19,7 +19,12 @@
 import com.google.gerrit.testutil.InMemoryModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
+import org.apache.http.impl.nio.client.HttpAsyncClients;
 import org.eclipse.jgit.lib.Config;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
@@ -27,6 +32,7 @@
 
   private static ElasticNodeInfo nodeInfo;
   private static ElasticContainer container;
+  private static CloseableHttpAsyncClient client;
 
   @BeforeClass
   public static void startIndexService() {
@@ -37,6 +43,8 @@
 
     container = ElasticContainer.createAndStart(ElasticVersion.V7_0);
     nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
+    client = HttpAsyncClients.createDefault();
+    client.start();
   }
 
   @AfterClass
@@ -46,6 +54,16 @@
     }
   }
 
+  @After
+  public void closeIndex() {
+    client.execute(
+        new HttpPost(
+            String.format(
+                "http://localhost:%d/%s*/_close", nodeInfo.port, getSanitizedMethodName())),
+        HttpClientContext.create(),
+        null);
+  }
+
   @Override
   protected void initAfterLifecycleStart() throws Exception {
     super.initAfterLifecycleStart();