Skip to content

Commit 1dc91f3

Browse files
committed
Remove stale test logging annotations (#43403)
This commit removes some very old test logging annotations that appeared to be added to investigate test failures that are long since closed. If these are needed, they can be added back on a case-by-case basis with a comment associating them to a test failure.
1 parent 1e81654 commit 1dc91f3

File tree

50 files changed

+19
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+19
-176
lines changed

modules/reindex/src/test/java/org/elasticsearch/index/reindex/CancelTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.elasticsearch.ingest.IngestTestPlugin;
3838
import org.elasticsearch.plugins.Plugin;
3939
import org.elasticsearch.tasks.TaskInfo;
40-
import org.elasticsearch.test.junit.annotations.TestLogging;
4140
import org.hamcrest.Matcher;
4241
import org.junit.Before;
4342

@@ -60,7 +59,6 @@
6059
* different cancellation places - that is the responsibility of AsyncBulkByScrollActionTests which have more precise control to
6160
* simulate failures but does not exercise important portion of the stack like transport and task management.
6261
*/
63-
@TestLogging("org.elasticsearch.index.reindex:DEBUG,org.elasticsearch.action.bulk:DEBUG")
6462
public class CancelTests extends ReindexTestCase {
6563

6664
protected static final String INDEX = "reindex-cancel-index";

modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFailureTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.elasticsearch.action.bulk.BulkItemResponse.Failure;
2323
import org.elasticsearch.action.index.IndexRequestBuilder;
24-
import org.elasticsearch.test.junit.annotations.TestLogging;
2524

2625
import java.util.ArrayList;
2726
import java.util.List;
@@ -38,7 +37,6 @@
3837
/**
3938
* Tests failure capturing and abort-on-failure behavior of reindex.
4039
*/
41-
@TestLogging("_root:DEBUG")
4240
public class ReindexFailureTests extends ReindexTestCase {
4341
public void testFailuresCauseAbortDefault() throws Exception {
4442
/*

modules/reindex/src/test/java/org/elasticsearch/index/reindex/UpdateByQueryBasicTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.elasticsearch.action.index.IndexRequestBuilder;
2323
import org.elasticsearch.search.sort.SortOrder;
24-
import org.elasticsearch.test.junit.annotations.TestLogging;
2524

2625
import java.util.ArrayList;
2726
import java.util.Collection;
@@ -34,7 +33,6 @@
3433
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
3534
import static org.hamcrest.Matchers.hasSize;
3635

37-
@TestLogging("org.elasticsearch.index.reindex:TRACE,org.elasticsearch.action.bulk:TRACE,org.elasticsearch.search.SearchService:TRACE")
3836
public class UpdateByQueryBasicTests extends ReindexTestCase {
3937
public void testBasics() throws Exception {
4038
indexRandom(true, client().prepareIndex("test", "test", "1").setSource("foo", "a"),

server/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.elasticsearch.indices.IndicesService;
3939
import org.elasticsearch.plugins.Plugin;
4040
import org.elasticsearch.test.ESIntegTestCase;
41-
import org.elasticsearch.test.junit.annotations.TestLogging;
4241
import org.elasticsearch.test.store.MockFSIndexStore;
4342

4443
import java.util.Arrays;
@@ -59,7 +58,6 @@
5958
import static org.hamcrest.Matchers.nullValue;
6059

6160
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST)
62-
@TestLogging("_root:DEBUG,org.elasticsearch.action.admin.indices.shards:TRACE,org.elasticsearch.cluster.service:TRACE")
6361
public class IndicesShardStoreRequestIT extends ESIntegTestCase {
6462

6563
@Override

server/src/test/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.elasticsearch.test.disruption.NetworkDisruption;
3232
import org.elasticsearch.test.disruption.NetworkDisruption.NetworkDisconnect;
3333
import org.elasticsearch.test.disruption.NetworkDisruption.TwoPartitions;
34-
import org.elasticsearch.test.junit.annotations.TestLogging;
3534
import org.elasticsearch.test.transport.MockTransportService;
3635

3736
import java.util.Arrays;
@@ -65,7 +64,6 @@ protected Settings nodeSettings(int nodeOrdinal) {
6564
* If the master node is being disrupted or if it cannot commit cluster state changes, it needs to retry within timeout limits.
6665
* This retry logic is implemented in TransportMasterNodeAction and tested by the following master failover scenario.
6766
*/
68-
@TestLogging("_root:DEBUG")
6967
public void testMasterFailoverDuringIndexingWithMappingChanges() throws Throwable {
7068
logger.info("--> start 4 nodes, 3 master, 1 data");
7169

server/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.elasticsearch.test.discovery.TestZenDiscovery;
3838
import org.elasticsearch.test.disruption.NetworkDisruption;
3939
import org.elasticsearch.test.disruption.NetworkDisruption.TwoPartitions;
40-
import org.elasticsearch.test.junit.annotations.TestLogging;
4140
import org.elasticsearch.test.transport.MockTransportService;
4241

4342
import java.util.Arrays;
@@ -61,7 +60,6 @@
6160
import static org.hamcrest.Matchers.nullValue;
6261

6362
@ClusterScope(scope = Scope.TEST, numDataNodes = 0, autoMinMasterNodes = false)
64-
@TestLogging("_root:DEBUG,org.elasticsearch.cluster.service:TRACE,org.elasticsearch.discovery.zen:TRACE")
6563
public class MinimumMasterNodesIT extends ESIntegTestCase {
6664

6765
@Override

server/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.elasticsearch.test.ESIntegTestCase;
3030
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
3131
import org.elasticsearch.test.ESIntegTestCase.Scope;
32-
import org.elasticsearch.test.junit.annotations.TestLogging;
3332

3433
import java.io.IOException;
3534
import java.util.Map;
@@ -41,7 +40,6 @@
4140
import static org.hamcrest.Matchers.nullValue;
4241

4342
@ClusterScope(scope = Scope.TEST, numDataNodes = 0, autoMinMasterNodes = false)
44-
@TestLogging("_root:DEBUG,org.elasticsearch.action.admin.cluster.state:TRACE")
4543
public class SpecificMasterNodesIT extends ESIntegTestCase {
4644

4745
@Override

server/src/test/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import org.elasticsearch.test.disruption.NetworkDisruption;
5252
import org.elasticsearch.test.disruption.NetworkDisruption.NetworkDisconnect;
5353
import org.elasticsearch.test.disruption.NetworkDisruption.TwoPartitions;
54-
import org.elasticsearch.test.junit.annotations.TestLogging;
5554
import org.elasticsearch.test.transport.MockTransportService;
5655

5756
import java.util.ArrayList;
@@ -482,8 +481,6 @@ public void testForceAllocatePrimaryOnNoDecision() throws Exception {
482481
/**
483482
* This test asserts that replicas failed to execute resync operations will be failed but not marked as stale.
484483
*/
485-
@TestLogging("_root:DEBUG, org.elasticsearch.cluster.routing.allocation:TRACE, org.elasticsearch.cluster.action.shard:TRACE," +
486-
"org.elasticsearch.indices.recovery:TRACE, org.elasticsearch.cluster.routing.allocation.allocator:TRACE")
487484
public void testPrimaryReplicaResyncFailed() throws Exception {
488485
String master = internalCluster().startMasterOnlyNode(Settings.EMPTY);
489486
final int numberOfReplicas = between(2, 3);

server/src/test/java/org/elasticsearch/cluster/service/ClusterServiceIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.elasticsearch.test.ESIntegTestCase;
3131
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
3232
import org.elasticsearch.test.ESIntegTestCase.Scope;
33-
import org.elasticsearch.test.junit.annotations.TestLogging;
3433

3534
import java.util.Arrays;
3635
import java.util.HashSet;
@@ -330,7 +329,6 @@ public void onFailure(String source, Exception e) {
330329
assertThat(processedLatch.await(1, TimeUnit.SECONDS), equalTo(true));
331330
}
332331

333-
@TestLogging("_root:debug,org.elasticsearch.action.admin.cluster.tasks:trace")
334332
public void testPendingUpdateTask() throws Exception {
335333
String node_0 = internalCluster().startNode();
336334
internalCluster().startCoordinatingOnlyNode(Settings.EMPTY);

server/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.elasticsearch.common.settings.Settings;
2323
import org.elasticsearch.common.unit.TimeValue;
2424
import org.elasticsearch.test.ESTestCase;
25-
import org.elasticsearch.test.junit.annotations.TestLogging;
2625

2726
import java.util.concurrent.TimeUnit;
2827
import java.util.function.Function;
@@ -155,7 +154,6 @@ public void testAutoQueueSizingWithMin() throws Exception {
155154
context.close();
156155
}
157156

158-
@TestLogging("org.elasticsearch.common.util.concurrent:DEBUG")
159157
public void testAutoQueueSizingWithMax() throws Exception {
160158
ThreadContext context = new ThreadContext(Settings.EMPTY);
161159
ResizableBlockingQueue<Runnable> queue =

0 commit comments

Comments
 (0)