Merge branch 'main' into rtv0

Author: jdconrad

muted-tests.yml

@@ -627,9 +627,6 @@ tests:
 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
   method: test {csv-spec:string.SpaceNegative}
   issue: https://github.com/elastic/elasticsearch/issues/136249
-- class: org.elasticsearch.cluster.coordination.NodeJoiningIT
-  method: testNodeTriesToJoinClusterAndThenSameMasterIsElected
-  issue: https://github.com/elastic/elasticsearch/issues/136332
 - class: org.elasticsearch.xpack.restart.FullClusterRestartIT
   method: testDataStreams {cluster=UPGRADED}
   issue: https://github.com/elastic/elasticsearch/issues/136353

server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/NodeJoiningIT.java

@@ -23,6 +23,7 @@
 import org.elasticsearch.test.ClusterServiceUtils;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.MockLog;
+import org.elasticsearch.test.junit.annotations.TestIssueLogging;
 import org.elasticsearch.test.junit.annotations.TestLogging;
 import org.elasticsearch.test.transport.MockTransportService;
 import org.elasticsearch.transport.Transport;
@@ -133,6 +134,10 @@ public void testNodeTriesToJoinClusterAndThenDifferentMasterIsElected() {
         Node N should join the cluster, but it should not be disconnected (#ES-11449)
      */
     @TestLogging(reason = "test includes assertions about logging", value = "org.elasticsearch.cluster.coordination:INFO")
+    @TestIssueLogging(
+        value = "org.elasticsearch.cluster.coordination.NodeJoiningIT:DEBUG",
+        issueUrl = "https://github.com/elastic/elasticsearch/issues/136332"
+    )
     public void testNodeTriesToJoinClusterAndThenSameMasterIsElected() {
         internalCluster().startNodes(3);
         ensureStableCluster(3);