Fix Watcher ExecuteWatchQueuedStatsTests (elastic#82134)

astefan · Jan 7, 2022 · 3fc9d75 · 3fc9d75
1 parent 3c47de5
commit 3fc9d75
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/...sterTest/java/org/elasticsearch/xpack/watcher/execution/ExecuteWatchQueuedStatsTests.java b/...sterTest/java/org/elasticsearch/xpack/watcher/execution/ExecuteWatchQueuedStatsTests.java
@@ -7,7 +7,6 @@
 
 package org.elasticsearch.xpack.watcher.execution;
 
-import org.apache.lucene.util.LuceneTestCase;
 import org.elasticsearch.action.ActionFuture;
 import org.elasticsearch.action.FailedNodeException;
 import org.elasticsearch.client.internal.Client;
@@ -22,7 +21,8 @@
 import org.elasticsearch.xpack.core.watcher.transport.actions.put.PutWatchRequestBuilder;
 import org.elasticsearch.xpack.core.watcher.transport.actions.stats.WatcherStatsRequestBuilder;
 import org.elasticsearch.xpack.core.watcher.transport.actions.stats.WatcherStatsResponse;
-import org.elasticsearch.xpack.watcher.actions.index.IndexAction;
+import org.elasticsearch.xpack.watcher.actions.logging.LoggingAction;
+import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
 import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase;
 import org.elasticsearch.xpack.watcher.trigger.manual.ManualTriggerEvent;
 import org.elasticsearch.xpack.watcher.trigger.schedule.ScheduleTriggerEvent;
@@ -35,13 +35,14 @@
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import static org.elasticsearch.xpack.watcher.input.InputBuilders.simpleInput;
 import static org.elasticsearch.xpack.watcher.trigger.TriggerBuilders.schedule;
 import static org.elasticsearch.xpack.watcher.trigger.schedule.Schedules.interval;
 import static org.hamcrest.Matchers.empty;
 
-@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/66392")
 public class ExecuteWatchQueuedStatsTests extends AbstractWatcherIntegrationTestCase {
 
     @Override
@@ -66,8 +67,12 @@ public void testQueuedStats() throws ExecutionException, InterruptedException {
         new PutWatchRequestBuilder(client, "id").setActive(true)
             .setSource(
                 new WatchSourceBuilder().input(simpleInput("payload", "yes"))
-                    .trigger(schedule(interval("1s")))
-                    .addAction("action", TimeValue.timeValueSeconds(1), IndexAction.builder("test_index").setDocId("id"))
+                    .trigger(schedule(interval("1h")))
+                    .addAction(
+                        "action",
+                        TimeValue.timeValueSeconds(1),
+                        LoggingAction.builder(new TextTemplate("logging action for testQueuedStats"))
+                    )
             )
             .get();
 
@@ -95,7 +100,7 @@ public void testQueuedStats() throws ExecutionException, InterruptedException {
                     fail(e.toString());
                 }
                 request.setActionMode("_all", ActionExecutionMode.EXECUTE);
-                request.setRecordExecution(true);
+                request.setRecordExecution(false);
                 futures.add(client.execute(ExecuteWatchAction.INSTANCE, request));
             }
         });
@@ -119,7 +124,11 @@ public void testQueuedStats() throws ExecutionException, InterruptedException {
         watcherStatsThread.join();
 
         for (final ActionFuture<ExecuteWatchResponse> future : futures) {
-            future.get();
+            try {
+                future.get(1, TimeUnit.MINUTES);
+            } catch (TimeoutException e) {
+                fail(e.toString());
+            }
         }
 
         assertThat(failures, empty());