honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce TestLogging usage in DisruptionIT tests (#43411) 

Removes `@TestLogging` annotations in `*DisruptionIT` tests, so that the only
tests with annotations are those with open issues. Also adds links to the open
issues in the remaining cases.

Relates #43403
This commit is contained in:
David Turner 2019-06-21 06:59:14 +01:00
parent eeb1812510
commit e4fd0ce730
5 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java
View File

@ -83,7 +83,6 @@ import static org.hamcrest.Matchers.not;
/** /**
* Tests various cluster operations (e.g., indexing) during disruptions. * 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) @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0)
public class ClusterDisruptionIT extends AbstractDisruptionTestCase { 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.discovery:TRACE,org.elasticsearch.action.support.replication:TRACE," +
"org.elasticsearch.cluster.service:TRACE,org.elasticsearch.indices.recovery:TRACE," + "org.elasticsearch.cluster.service:TRACE,org.elasticsearch.indices.recovery:TRACE," +
"org.elasticsearch.indices.cluster:TRACE,org.elasticsearch.index.shard: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 { public void testAckedIndexing() throws Exception {
final int seconds = !(TEST_NIGHTLY && rarely()) ? 1 : 5; final int seconds = !(TEST_NIGHTLY && rarely()) ? 1 : 5;

2
server/src/test/java/org/elasticsearch/discovery/DiscoveryDisruptionIT.java
View File

@ -34,7 +34,6 @@ import org.elasticsearch.test.disruption.NetworkDisruption;
import org.elasticsearch.test.disruption.NetworkDisruption.NetworkDisconnect; import org.elasticsearch.test.disruption.NetworkDisruption.NetworkDisconnect;
import org.elasticsearch.test.disruption.ServiceDisruptionScheme; import org.elasticsearch.test.disruption.ServiceDisruptionScheme;
import org.elasticsearch.test.disruption.SlowClusterStateProcessing; import org.elasticsearch.test.disruption.SlowClusterStateProcessing;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.test.transport.MockTransportService;
import org.elasticsearch.transport.Transport; import org.elasticsearch.transport.Transport;
import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.TransportService;
@ -51,7 +50,6 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo;
/** /**
* Tests for discovery during disruptions. * Tests for discovery during disruptions.
*/ */
@TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE")
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0) @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0)
public class DiscoveryDisruptionIT extends AbstractDisruptionTestCase { public class DiscoveryDisruptionIT extends AbstractDisruptionTestCase {

2
server/src/test/java/org/elasticsearch/discovery/DiskDisruptionIT.java
View File

@ -30,7 +30,6 @@ import org.elasticsearch.index.seqno.SequenceNumbers;
import org.elasticsearch.test.BackgroundIndexer; import org.elasticsearch.test.BackgroundIndexer;
import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.InternalTestCluster;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; 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.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo;
@TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE")
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0) @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0)
public class DiskDisruptionIT extends AbstractDisruptionTestCase { public class DiskDisruptionIT extends AbstractDisruptionTestCase {

2
server/src/test/java/org/elasticsearch/discovery/MasterDisruptionIT.java
View File

@ -37,7 +37,6 @@ import org.elasticsearch.test.disruption.NetworkDisruption;
import org.elasticsearch.test.disruption.NetworkDisruption.TwoPartitions; import org.elasticsearch.test.disruption.NetworkDisruption.TwoPartitions;
import org.elasticsearch.test.disruption.ServiceDisruptionScheme; import org.elasticsearch.test.disruption.ServiceDisruptionScheme;
import org.elasticsearch.test.disruption.SingleNodeDisruption; import org.elasticsearch.test.disruption.SingleNodeDisruption;
import org.elasticsearch.test.junit.annotations.TestLogging;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
@ -52,7 +51,6 @@ import static org.hamcrest.Matchers.not;
/** /**
* Tests relating to the loss of the master. * 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) @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0)
public class MasterDisruptionIT extends AbstractDisruptionTestCase { public class MasterDisruptionIT extends AbstractDisruptionTestCase {

3
server/src/test/java/org/elasticsearch/discovery/StableMasterDisruptionIT.java
View File

@ -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 * 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. * 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) @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0)
public class StableMasterDisruptionIT extends ESIntegTestCase { 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 * 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. * 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 { public void testStaleMasterNotHijackingMajority() throws Exception {
final List<String> nodes = internalCluster().startNodes(3, Settings.builder() final List<String> nodes = internalCluster().startNodes(3, Settings.builder()
.put(LeaderChecker.LEADER_CHECK_TIMEOUT_SETTING.getKey(), "1s") .put(LeaderChecker.LEADER_CHECK_TIMEOUT_SETTING.getKey(), "1s")