diff --git a/server/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java index 76e519f922e..215ac768818 100644 --- a/server/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java +++ b/server/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java @@ -83,7 +83,6 @@ import static org.hamcrest.Matchers.not; /** * Tests various cluster operations (e.g., indexing) during disruptions. */ -@TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE") @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0) public class ClusterDisruptionIT extends AbstractDisruptionTestCase { @@ -109,6 +108,7 @@ public class ClusterDisruptionIT extends AbstractDisruptionTestCase { "org.elasticsearch.discovery:TRACE,org.elasticsearch.action.support.replication:TRACE," + "org.elasticsearch.cluster.service:TRACE,org.elasticsearch.indices.recovery:TRACE," + "org.elasticsearch.indices.cluster:TRACE,org.elasticsearch.index.shard:TRACE") + // TestLogging for https://github.com/elastic/elasticsearch/issues/41068 public void testAckedIndexing() throws Exception { final int seconds = !(TEST_NIGHTLY && rarely()) ? 1 : 5; diff --git a/server/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java index 4fabbe74848..6bcf74ab9aa 100644 --- a/server/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java +++ b/server/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java @@ -34,7 +34,6 @@ import org.elasticsearch.test.disruption.NetworkDisruption; import org.elasticsearch.test.disruption.NetworkDisruption.NetworkDisconnect; import org.elasticsearch.test.disruption.ServiceDisruptionScheme; import org.elasticsearch.test.disruption.SlowClusterStateProcessing; -import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.transport.Transport; import org.elasticsearch.transport.TransportService; @@ -51,7 +50,6 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; /** * Tests for discovery during disruptions. */ -@TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE") @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0) public class DiscoveryDisruptionIT extends AbstractDisruptionTestCase { diff --git a/server/src/test/java/org/elasticsearch/discovery/DiskDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/DiskDisruptionIT.java index 714ae7e5688..dac48d89e78 100644 --- a/server/src/test/java/org/elasticsearch/discovery/DiskDisruptionIT.java +++ b/server/src/test/java/org/elasticsearch/discovery/DiskDisruptionIT.java @@ -30,7 +30,6 @@ import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.test.BackgroundIndexer; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.InternalTestCluster; -import org.elasticsearch.test.junit.annotations.TestLogging; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -49,7 +48,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -@TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE") @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0) public class DiskDisruptionIT extends AbstractDisruptionTestCase { diff --git a/server/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java index 86c706d0081..8f422537b38 100644 --- a/server/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java +++ b/server/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java @@ -37,7 +37,6 @@ import org.elasticsearch.test.disruption.NetworkDisruption; import org.elasticsearch.test.disruption.NetworkDisruption.TwoPartitions; import org.elasticsearch.test.disruption.ServiceDisruptionScheme; import org.elasticsearch.test.disruption.SingleNodeDisruption; -import org.elasticsearch.test.junit.annotations.TestLogging; import java.util.ArrayList; import java.util.HashSet; @@ -52,7 +51,6 @@ import static org.hamcrest.Matchers.not; /** * Tests relating to the loss of the master. */ -@TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE") @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0) public class MasterDisruptionIT extends AbstractDisruptionTestCase { diff --git a/server/src/test/java/org/elasticsearch/discovery/StableMasterDisruptionIT.java b/server/src/test/java/org/elasticsearch/discovery/StableMasterDisruptionIT.java index c4655bcf7ce..23194ab5c55 100644 --- a/server/src/test/java/org/elasticsearch/discovery/StableMasterDisruptionIT.java +++ b/server/src/test/java/org/elasticsearch/discovery/StableMasterDisruptionIT.java @@ -65,7 +65,6 @@ import static org.hamcrest.Matchers.equalTo; * Tests relating to the loss of the master, but which work with the default fault detection settings which are rather lenient and will * not detect a master failure too quickly. */ -@TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE") @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0) public class StableMasterDisruptionIT extends ESIntegTestCase { @@ -174,6 +173,8 @@ public class StableMasterDisruptionIT extends ESIntegTestCase { * Tests that emulates a frozen elected master node that unfreezes and pushes its cluster state to other nodes that already are * following another elected master node. These nodes should reject this cluster state and prevent them from following the stale master. */ + @TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE") + // TestLogging for https://github.com/elastic/elasticsearch/issues/43392 public void testStaleMasterNotHijackingMajority() throws Exception { final List nodes = internalCluster().startNodes(3, Settings.builder() .put(LeaderChecker.LEADER_CHECK_TIMEOUT_SETTING.getKey(), "1s")