Revert "Add extra logging to testChildrenTasksCancelledOnTimeout (#128888)"

This reverts commit 43a9e6f.

Author: DaveCTurner

muted-tests.yml

@@ -204,6 +204,9 @@ tests:
 - class: org.elasticsearch.packaging.test.DockerTests
   method: test151MachineDependentHeapWithSizeOverride
   issue: https://github.com/elastic/elasticsearch/issues/123437
+- class: org.elasticsearch.action.admin.cluster.node.tasks.CancellableTasksIT
+  method: testChildrenTasksCancelledOnTimeout
+  issue: https://github.com/elastic/elasticsearch/issues/123568
 - class: org.elasticsearch.xpack.searchablesnapshots.FrozenSearchableSnapshotsIntegTests
   method: testCreateAndRestorePartialSearchableSnapshot
   issue: https://github.com/elastic/elasticsearch/issues/123773

server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksIT.java

@@ -17,7 +17,6 @@
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
-import org.elasticsearch.action.DelegatingActionListener;
 import org.elasticsearch.action.LatchedActionListener;
 import org.elasticsearch.action.LegacyActionRequest;
 import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
@@ -27,7 +26,6 @@
 import org.elasticsearch.action.support.PlainActionFuture;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.cluster.node.DiscoveryNode;
-import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.util.CollectionUtils;
@@ -36,8 +34,6 @@
 import org.elasticsearch.common.util.set.Sets;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.injection.guice.Inject;
-import org.elasticsearch.logging.LogManager;
-import org.elasticsearch.logging.Logger;
 import org.elasticsearch.plugins.ActionPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.tasks.CancellableTask;
@@ -47,7 +43,6 @@
 import org.elasticsearch.tasks.TaskInfo;
 import org.elasticsearch.tasks.TaskManager;
 import org.elasticsearch.test.ESIntegTestCase;
-import org.elasticsearch.test.junit.annotations.TestIssueLogging;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.ReceiveTimeoutTransportException;
 import org.elasticsearch.transport.SendRequestTransportException;
@@ -79,9 +74,6 @@
 @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST)
 public class CancellableTasksIT extends ESIntegTestCase {
 
-    // Temporary addition for investigation into https://github.com/elastic/elasticsearch/issues/123568
-    private static final Logger logger = LogManager.getLogger(CancellableTasksIT.class);
-
     static int idGenerator = 0;
     static final Map<TestRequest, CountDownLatch> beforeSendLatches = ConcurrentCollections.newConcurrentMap();
     static final Map<TestRequest, CountDownLatch> arrivedLatches = ConcurrentCollections.newConcurrentMap();
@@ -374,42 +366,18 @@ public void testRemoveBanParentsOnDisconnect() throws Exception {
         }
     }
 
-    @TestIssueLogging(
-        issueUrl = "https://github.com/elastic/elasticsearch/issues/123568",
-        value = "org.elasticsearch.transport.TransportService.tracer:TRACE"
-            + ",org.elasticsearch.tasks.TaskManager:TRACE"
-            + ",org.elasticsearch.action.admin.cluster.node.tasks.CancellableTasksIT:DEBUG"
-    )
     public void testChildrenTasksCancelledOnTimeout() throws Exception {
         Set<DiscoveryNode> nodes = clusterService().state().nodes().stream().collect(Collectors.toSet());
         final TestRequest rootRequest = generateTestRequest(nodes, 0, between(1, 4), true);
-        logger.info("generated request\n{}", buildTestRequestDescription(rootRequest, "", new StringBuilder()).toString());
         ActionFuture<TestResponse> rootTaskFuture = client().execute(TransportTestAction.ACTION, rootRequest);
-        logger.info("action executed");
         allowEntireRequest(rootRequest);
-        logger.info("execution released");
         waitForRootTask(rootTaskFuture, true);
-        logger.info("root task completed");
         ensureBansAndCancellationsConsistency();
-        logger.info("ensureBansAndCancellationsConsistency completed");
 
         // Make sure all descendent requests have completed
         for (TestRequest subRequest : rootRequest.descendants()) {
-            logger.info("awaiting completion of request {}", subRequest.getDescription());
             safeAwait(completedLatches.get(subRequest));
         }
-        logger.info("all requests completed");
-    }
-
-    // Temporary addition for investigation into https://github.com/elastic/elasticsearch/issues/123568
-    static StringBuilder buildTestRequestDescription(TestRequest request, String prefix, StringBuilder stringBuilder) {
-        stringBuilder.append(prefix)
-            .append(Strings.format("id=%d [timeout=%s] %s", request.id, request.timeout, request.node.descriptionWithoutAttributes()))
-            .append('\n');
-        for (TestRequest subRequest : request.subRequests) {
-            buildTestRequestDescription(subRequest, prefix + "  ", stringBuilder);
-        }
-        return stringBuilder;
     }
 
     static TaskId getRootTaskId(TestRequest request) throws Exception {
@@ -538,8 +506,6 @@ public void writeTo(StreamOutput out) throws IOException {
 
     public static class TransportTestAction extends HandledTransportAction<TestRequest, TestResponse> {
 
-        private static final Logger logger = CancellableTasksIT.logger;
-
         public static ActionType<TestResponse> ACTION = new ActionType<>("internal::test_action");
         private final TransportService transportService;
         private final NodeClient client;
@@ -599,22 +565,7 @@ protected void doExecute(Task task, TestRequest request, ActionListener<TestResp
         protected void startSubTask(TaskId parentTaskId, TestRequest subRequest, ActionListener<TestResponse> listener) {
             subRequest.setParentTask(parentTaskId);
             CountDownLatch completeLatch = completedLatches.get(subRequest);
-            ActionListener<TestResponse> latchedListener = new DelegatingActionListener<>(
-                new LatchedActionListener<>(listener, completeLatch)
-            ) {
-                // Temporary logging addition for investigation into https://github.com/elastic/elasticsearch/issues/123568
-                @Override
-                public void onResponse(TestResponse testResponse) {
-                    logger.debug("processing successful response to request [{}]", subRequest.getDescription());
-                    delegate.onResponse(testResponse);
-                }
-
-                @Override
-                public void onFailure(Exception e) {
-                    logger.debug("processing exceptional response to request [{}]: {}", subRequest.getDescription(), e.getMessage());
-                    super.onFailure(e);
-                }
-            };
+            LatchedActionListener<TestResponse> latchedListener = new LatchedActionListener<>(listener, completeLatch);
             transportService.getThreadPool().generic().execute(new AbstractRunnable() {
                 @Override
                 public void onFailure(Exception e) {
@@ -645,13 +596,6 @@ protected void doRun() throws Exception {
                                 TransportResponseHandler.TRANSPORT_WORKER
                             )
                         );
-                        // Temporary addition for investigation into https://github.com/elastic/elasticsearch/issues/123568
-                        logger.debug(
-                            "sent test request [{}] from [{}] to [{}]",
-                            subRequest.getDescription(),
-                            client.getLocalNodeId(),
-                            subRequest.node.descriptionWithoutAttributes()
-                        );
                     }
                 }
             });