Enable DeprecationHttpIT and resetFeatures in MlDeprecationIT (#79071)

closes #79038
elastic · Oct 14, 2021 · 737704e · 737704e
1 parent c375013
commit 737704e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/.../qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/DeprecationHttpIT.java b/.../qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/DeprecationHttpIT.java
@@ -59,7 +59,6 @@
 /**
  * Tests that deprecation message are returned via response headers, and can be indexed into a data stream.
  */
-@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/79038")
 public class DeprecationHttpIT extends ESRestTestCase {
 
     /**
@@ -90,12 +89,22 @@ public void assertIndexingIsEnabled() throws Exception {
             }
             List<Map<String, Object>> documents = getIndexedDeprecations();
             logger.warn(documents);
+            // if data stream is still present, that means that previous test (could be different class) created a deprecation
+            // hence resetting again
+            resetDeprecationIndexAndCache();
             fail("Index should be removed on startup");
         }, 30, TimeUnit.SECONDS);
     }
 
     @After
     public void cleanUp() throws Exception {
+        resetDeprecationIndexAndCache();
+
+        // switch logging setting to default
+        configureWriteDeprecationLogsToIndex(null);
+    }
+
+    private void resetDeprecationIndexAndCache() throws Exception {
         // making sure the deprecation indexing cache is reset and index is deleted
         assertBusy(() -> {
             try {
@@ -106,9 +115,6 @@ public void cleanUp() throws Exception {
             }
 
         }, 30, TimeUnit.SECONDS);
-
-        // switch logging setting to default
-        configureWriteDeprecationLogsToIndex(null);
     }
 
     /**

diff --git a/...on/qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/MlDeprecationIT.java b/...on/qa/rest/src/javaRestTest/java/org/elasticsearch/xpack/deprecation/MlDeprecationIT.java
@@ -9,7 +9,9 @@
 
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.client.Request;
 import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.Response;
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.client.WarningsHandler;
@@ -25,7 +27,9 @@
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.xcontent.NamedXContentRegistry;
 import org.elasticsearch.xcontent.XContentType;
+import org.junit.After;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Map;
@@ -46,6 +50,12 @@ private static class HLRC extends RestHighLevelClient {
         }
     }
 
+    @After
+    public void resetFeatures() throws IOException {
+        Response response = adminClient().performRequest(new Request("POST", "/_features/_reset"));
+        assertOK(response);
+    }
+
     @Override
     protected NamedXContentRegistry xContentRegistry() {
         SearchModule searchModule = new SearchModule(Settings.EMPTY, Collections.emptyList());
@@ -97,7 +107,6 @@ public void testMlDeprecationChecks() throws Exception {
             containsString("model snapshot [1] for job [deprecation_check_job] needs to be deleted or upgraded")
         );
         assertThat(response.getMlSettingsIssues().get(0).getMeta(), equalTo(Map.of("job_id", jobId, "snapshot_id", "1")));
-        hlrc.close();
     }
 
 }
diff --git a/...c/main/java/org/elasticsearch/xpack/deprecation/logging/DeprecationIndexingComponent.java b/...c/main/java/org/elasticsearch/xpack/deprecation/logging/DeprecationIndexingComponent.java
@@ -33,7 +33,7 @@
 import org.elasticsearch.xpack.core.ClientHelper;
 
 import java.util.Arrays;
-import java.util.Map;
+import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -139,9 +139,10 @@ public void afterBulk(long executionId, BulkRequest request, BulkResponse respon
             }
 
             if (response.hasFailures()) {
-                Map<String, String> failures = Arrays.stream(response.getItems())
+                List<String> failures = Arrays.stream(response.getItems())
                     .filter(BulkItemResponse::isFailed)
-                    .collect(Collectors.toMap(BulkItemResponse::getId, BulkItemResponse::getFailureMessage));
+                    .map(r -> r.getId() + " " + r.getFailureMessage() )
+                    .collect(Collectors.toList());
                 logger.error("Bulk write of deprecation logs encountered some failures: [{}]", failures);
             }
         }