Revert "Fix tests for OpenSearch and blocked index/cluster after wate…

…rmark hit (#15420)"

This reverts commit 259fffb.

graylog-storage-elasticsearch7/src/test/java/org/graylog/storage/elasticsearch7/testing/ClientES7.java

@@ -24,8 +24,6 @@
 import com.github.rholder.retry.WaitStrategies;
 import com.google.common.collect.Streams;
 import org.graylog.shaded.elasticsearch7.org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
-import org.graylog.shaded.elasticsearch7.org.elasticsearch.action.admin.cluster.settings.ClusterGetSettingsRequest;
-import org.graylog.shaded.elasticsearch7.org.elasticsearch.action.admin.cluster.settings.ClusterGetSettingsResponse;
 import org.graylog.shaded.elasticsearch7.org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
 import org.graylog.shaded.elasticsearch7.org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.graylog.shaded.elasticsearch7.org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions;
@@ -250,14 +248,6 @@ private String[] existingIndices() {
                 .toArray(String[]::new);
     }
 
-
-    public String getSetting(String setting) {
-        final ClusterGetSettingsRequest req = new ClusterGetSettingsRequest();
-        final ClusterGetSettingsResponse response = client.execute((c, requestOptions) -> c.cluster().getSettings(req, requestOptions),
-                "Unable to read OS cluster setting: " + setting);
-        return response.getSetting(setting);
-    }
-
     @Override
     public void putSetting(String setting, String value) {
         final ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest();
@@ -284,11 +274,6 @@ public void resetIndexBlock(String index) {
                 "Unable to reset index block for " + index);
     }
 
-    @Override
-    public void resetClusterBlock() {
-        // noop for ES7, needed for OS 2.x
-    }
-
     @Override
     public void setIndexBlock(String index) {
         final UpdateSettingsRequest request = new UpdateSettingsRequest(index)

graylog-storage-opensearch2/src/test/java/org/graylog/storage/opensearch2/MessagesOS2IT.java

@@ -16,12 +16,17 @@
  */
 package org.graylog.storage.opensearch2;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.graylog.shaded.opensearch2.org.opensearch.action.admin.indices.refresh.RefreshRequest;
 import org.graylog.shaded.opensearch2.org.opensearch.action.index.IndexRequest;
 import org.graylog.shaded.opensearch2.org.opensearch.action.index.IndexResponse;
+import org.graylog.shaded.opensearch2.org.opensearch.client.core.CountRequest;
+import org.graylog.shaded.opensearch2.org.opensearch.client.core.CountResponse;
 import org.graylog.shaded.opensearch2.org.opensearch.rest.RestStatus;
 import org.graylog.storage.opensearch2.testing.OpenSearchInstance;
 import org.graylog.testing.elasticsearch.SearchServerInstance;
 import org.graylog2.indexer.messages.MessagesIT;
+import org.graylog2.shared.bindings.providers.ObjectMapperProvider;
 import org.junit.Rule;
 
 import java.util.Map;

graylog-storage-opensearch2/src/test/java/org/graylog/storage/opensearch2/testing/ClientOS2.java

@@ -24,8 +24,6 @@
 import com.github.rholder.retry.WaitStrategies;
 import com.google.common.collect.Streams;
 import org.graylog.shaded.opensearch2.org.opensearch.action.admin.cluster.health.ClusterHealthRequest;
-import org.graylog.shaded.opensearch2.org.opensearch.action.admin.cluster.settings.ClusterGetSettingsRequest;
-import org.graylog.shaded.opensearch2.org.opensearch.action.admin.cluster.settings.ClusterGetSettingsResponse;
 import org.graylog.shaded.opensearch2.org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
 import org.graylog.shaded.opensearch2.org.opensearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.graylog.shaded.opensearch2.org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions;
@@ -223,7 +221,6 @@ public void cleanUp() {
         deleteIndices(existingIndices());
         deleteTemplates(existingTemplates());
         refreshNode();
-        resetClusterBlock();
     }
 
     private String[] existingTemplates() {
@@ -255,31 +252,7 @@ private String[] existingIndices() {
     public void putSetting(String setting, String value) {
         final ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest();
 
-        if(value == null) {
-            request.transientSettings(Settings.builder().putNull(setting));
-        } else {
-            request.transientSettings(Settings.builder().put(setting, value));
-        }
-
-        client.execute((c, requestOptions) -> c.cluster().putSettings(request, requestOptions),
-                "Unable to update OS cluster setting: " + setting + "=" + value);
-    }
-
-    public String getSetting(String setting) {
-        final ClusterGetSettingsRequest req = new ClusterGetSettingsRequest();
-        final ClusterGetSettingsResponse response = client.execute((c, requestOptions) -> c.cluster().getSettings(req, requestOptions),
-                "Unable to read OS cluster setting: " + setting);
-        return response.getSetting(setting);
-    }
-
-    public void putPersistentSetting(String setting, String value) {
-        final ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest();
-
-        if(value == null) {
-            request.persistentSettings(Settings.builder().putNull(setting));
-        } else {
-            request.persistentSettings(Settings.builder().put(setting, value));
-        }
+        request.persistentSettings(Settings.builder().put(setting, value));
 
         client.execute((c, requestOptions) -> c.cluster().putSettings(request, requestOptions),
                 "Unable to update OS cluster setting: " + setting + "=" + value);
@@ -301,17 +274,6 @@ public void resetIndexBlock(String index) {
                 "Unable to reset index block for " + index);
     }
 
-    @Override
-    public void resetClusterBlock() {
-        final String block = getSetting("cluster.blocks.create_index");
-        if(Boolean.parseBoolean(block)) {
-            // high memory usage in previous tests may cause a cluster block. If that happens, we should reset this block before the next test.
-            LOG.info("Indexer cluster is blocked after heavy memory/disk usage, resetting the block");
-            // reset create_index block for OpenSearch 2.x see https://github.com/opensearch-project/OpenSearch/pull/5852
-            putPersistentSetting("cluster.blocks.create_index", null);
-        }
-    }
-
     @Override
     public void setIndexBlock(String index) {
         final UpdateSettingsRequest request = new UpdateSettingsRequest(index)

graylog-storage-opensearch2/src/test/java/org/graylog/storage/opensearch2/testing/OpenSearchInstance.java

@@ -46,7 +46,7 @@
 public class OpenSearchInstance extends TestableSearchServerInstance {
     private static final Logger LOG = LoggerFactory.getLogger(OpenSearchInstance.class);
 
-    public static final String DEFAULT_HEAP_SIZE = "5g";
+    public static final String DEFAULT_HEAP_SIZE = "2g";
     public static final SearchServer OPENSEARCH_VERSION = SearchServer.DEFAULT_OPENSEARCH_VERSION;
 
     private final OpenSearchClient openSearchClient;

graylog2-server/src/test/java/org/graylog/testing/containermatrix/SearchServer.java

@@ -26,7 +26,7 @@ public enum SearchServer {
     ES7(ELASTICSEARCH, "7.10.2"),
     OS1(OPENSEARCH, "1.3.1"),
     OS2(OPENSEARCH, "2.0.1"),
-    OS2_LATEST(OPENSEARCH, "2.8.0"),
+    OS2_LATEST(OPENSEARCH, "2.4.0"),
     DATANODE_DEV(DATANODE, "5.2.0");
 
     public static final SearchServer DEFAULT_VERSION = DATANODE_DEV;

graylog2-server/src/test/java/org/graylog/testing/elasticsearch/Client.java

@@ -61,14 +61,11 @@ default String createRandomIndex(String prefix) {
     String fieldType(String testIndexName, String source);
 
     void putSetting(String setting, String value);
-    String getSetting(String setting);
 
     void waitForIndexBlock(String index);
 
     void resetIndexBlock(String index);
 
-    void resetClusterBlock();
-
     void setIndexBlock(String index);
 
     void updateMapping(String index, Map<String, Object> mapping);