Skip to content

Commit ed3b436

Browse files
authored
Fix unintended debug logging in subclasses of TransportMasterNodeAction (#50839)
Use more specific loggers in subclasses of TMNA so debug messages are not logged by default
1 parent 3f9e11a commit ed3b436

File tree

47 files changed

+184
-16
lines changed

Some content is hidden

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

47 files changed

+184
-16
lines changed

server/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package org.elasticsearch.action.admin.cluster.allocation;
2121

22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2224
import org.elasticsearch.action.ActionListener;
2325
import org.elasticsearch.action.support.ActionFilters;
2426
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -55,6 +57,8 @@
5557
public class TransportClusterAllocationExplainAction
5658
extends TransportMasterNodeAction<ClusterAllocationExplainRequest, ClusterAllocationExplainResponse> {
5759

60+
private static final Logger logger = LogManager.getLogger(TransportClusterAllocationExplainAction.class);
61+
5862
private final ClusterInfoService clusterInfoService;
5963
private final AllocationDeciders allocationDeciders;
6064
private final ShardsAllocator shardAllocator;

server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919
package org.elasticsearch.action.admin.cluster.configuration;
2020

21+
import org.apache.logging.log4j.LogManager;
22+
import org.apache.logging.log4j.Logger;
2123
import org.elasticsearch.ElasticsearchException;
2224
import org.elasticsearch.ElasticsearchTimeoutException;
2325
import org.elasticsearch.action.ActionListener;
@@ -52,6 +54,8 @@
5254
public class TransportAddVotingConfigExclusionsAction extends TransportMasterNodeAction<AddVotingConfigExclusionsRequest,
5355
AddVotingConfigExclusionsResponse> {
5456

57+
private static final Logger logger = LogManager.getLogger(TransportAddVotingConfigExclusionsAction.class);
58+
5559
public static final Setting<Integer> MAXIMUM_VOTING_CONFIG_EXCLUSIONS_SETTING
5660
= Setting.intSetting("cluster.max_voting_config_exclusions", 10, 1, Property.Dynamic, Property.NodeScope);
5761

server/src/main/java/org/elasticsearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919
package org.elasticsearch.action.admin.cluster.configuration;
2020

21+
import org.apache.logging.log4j.LogManager;
22+
import org.apache.logging.log4j.Logger;
2123
import org.elasticsearch.ElasticsearchException;
2224
import org.elasticsearch.ElasticsearchTimeoutException;
2325
import org.elasticsearch.action.ActionListener;
@@ -48,6 +50,8 @@
4850
public class TransportClearVotingConfigExclusionsAction
4951
extends TransportMasterNodeAction<ClearVotingConfigExclusionsRequest, ClearVotingConfigExclusionsResponse> {
5052

53+
private static final Logger logger = LogManager.getLogger(TransportClearVotingConfigExclusionsAction.class);
54+
5155
@Inject
5256
public TransportClearVotingConfigExclusionsAction(TransportService transportService, ClusterService clusterService,
5357
ThreadPool threadPool, ActionFilters actionFilters,

server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package org.elasticsearch.action.admin.cluster.settings;
2121

22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2224
import org.apache.logging.log4j.message.ParameterizedMessage;
2325
import org.elasticsearch.ElasticsearchException;
2426
import org.elasticsearch.action.ActionListener;
@@ -46,6 +48,8 @@
4648
public class TransportClusterUpdateSettingsAction extends
4749
TransportMasterNodeAction<ClusterUpdateSettingsRequest, ClusterUpdateSettingsResponse> {
4850

51+
private static final Logger logger = LogManager.getLogger(TransportClusterUpdateSettingsAction.class);
52+
4953
private final AllocationService allocationService;
5054

5155
private final ClusterSettings clusterSettings;

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
import com.carrotsearch.hppc.cursors.ObjectCursor;
2323
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
24+
import org.apache.logging.log4j.LogManager;
25+
import org.apache.logging.log4j.Logger;
2426
import org.elasticsearch.action.ActionListener;
2527
import org.elasticsearch.action.ActionRunnable;
2628
import org.elasticsearch.action.support.ActionFilters;
@@ -60,6 +62,8 @@
6062

6163
public class TransportSnapshotsStatusAction extends TransportMasterNodeAction<SnapshotsStatusRequest, SnapshotsStatusResponse> {
6264

65+
private static final Logger logger = LogManager.getLogger(TransportSnapshotsStatusAction.class);
66+
6367
private final SnapshotsService snapshotsService;
6468

6569
private final TransportNodesSnapshotsStatus transportNodesSnapshotsStatus;

server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/TransportPendingClusterTasksAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package org.elasticsearch.action.admin.cluster.tasks;
2121

22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2224
import org.elasticsearch.action.ActionListener;
2325
import org.elasticsearch.action.support.ActionFilters;
2426
import org.elasticsearch.action.support.master.TransportMasterNodeReadAction;
@@ -38,6 +40,8 @@
3840
public class TransportPendingClusterTasksAction
3941
extends TransportMasterNodeReadAction<PendingClusterTasksRequest, PendingClusterTasksResponse> {
4042

43+
private static final Logger logger = LogManager.getLogger(TransportPendingClusterTasksAction.class);
44+
4145
private final ClusterService clusterService;
4246

4347
@Inject

server/src/main/java/org/elasticsearch/action/admin/indices/alias/TransportIndicesAliasesAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
package org.elasticsearch.action.admin.indices.alias;
2121

2222
import com.carrotsearch.hppc.cursors.ObjectCursor;
23+
import org.apache.logging.log4j.LogManager;
24+
import org.apache.logging.log4j.Logger;
2325
import org.elasticsearch.action.ActionListener;
2426
import org.elasticsearch.action.RequestValidators;
2527
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions;
@@ -60,6 +62,8 @@
6062
*/
6163
public class TransportIndicesAliasesAction extends TransportMasterNodeAction<IndicesAliasesRequest, AcknowledgedResponse> {
6264

65+
private static final Logger logger = LogManager.getLogger(TransportIndicesAliasesAction.class);
66+
6367
private final MetaDataIndexAliasesService indexAliasesService;
6468
private final RequestValidators<IndicesAliasesRequest> requestValidators;
6569

server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package org.elasticsearch.action.admin.indices.close;
2121

22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2224
import org.apache.logging.log4j.message.ParameterizedMessage;
2325
import org.elasticsearch.action.ActionListener;
2426
import org.elasticsearch.action.support.ActionFilters;
@@ -49,6 +51,8 @@
4951
*/
5052
public class TransportCloseIndexAction extends TransportMasterNodeAction<CloseIndexRequest, CloseIndexResponse> {
5153

54+
private static final Logger logger = LogManager.getLogger(TransportCloseIndexAction.class);
55+
5256
private final MetaDataIndexStateService indexStateService;
5357
private final DestructiveOperations destructiveOperations;
5458
private volatile boolean closeIndexEnabled;

server/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package org.elasticsearch.action.admin.indices.delete;
2121

22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2224
import org.apache.logging.log4j.message.ParameterizedMessage;
2325
import org.elasticsearch.action.ActionListener;
2426
import org.elasticsearch.action.support.ActionFilters;
@@ -48,6 +50,8 @@
4850
*/
4951
public class TransportDeleteIndexAction extends TransportMasterNodeAction<DeleteIndexRequest, AcknowledgedResponse> {
5052

53+
private static final Logger logger = LogManager.getLogger(TransportDeleteIndexAction.class);
54+
5155
private final MetaDataDeleteIndexService deleteIndexService;
5256
private final DestructiveOperations destructiveOperations;
5357

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package org.elasticsearch.action.admin.indices.mapping.get;
2121

22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2224
import org.elasticsearch.action.ActionListener;
2325
import org.elasticsearch.action.support.ActionFilters;
2426
import org.elasticsearch.action.support.master.info.TransportClusterInfoAction;
@@ -39,6 +41,8 @@
3941

4042
public class TransportGetMappingsAction extends TransportClusterInfoAction<GetMappingsRequest, GetMappingsResponse> {
4143

44+
private static final Logger logger = LogManager.getLogger(TransportGetMappingsAction.class);
45+
4246
private final IndicesService indicesService;
4347

4448
@Inject

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package org.elasticsearch.action.admin.indices.mapping.put;
2121

22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2224
import org.apache.logging.log4j.message.ParameterizedMessage;
2325
import org.elasticsearch.action.ActionListener;
2426
import org.elasticsearch.action.RequestValidators;
@@ -48,6 +50,8 @@
4850
*/
4951
public class TransportPutMappingAction extends TransportMasterNodeAction<PutMappingRequest, AcknowledgedResponse> {
5052

53+
private static final Logger logger = LogManager.getLogger(TransportPutMappingAction.class);
54+
5155
private final MetaDataMappingService metaDataMappingService;
5256
private final RequestValidators<PutMappingRequest> requestValidators;
5357

server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package org.elasticsearch.action.admin.indices.open;
2121

22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2224
import org.apache.logging.log4j.message.ParameterizedMessage;
2325
import org.elasticsearch.action.ActionListener;
2426
import org.elasticsearch.action.support.ActionFilters;
@@ -45,6 +47,8 @@
4547
*/
4648
public class TransportOpenIndexAction extends TransportMasterNodeAction<OpenIndexRequest, OpenIndexResponse> {
4749

50+
private static final Logger logger = LogManager.getLogger(TransportOpenIndexAction.class);
51+
4852
private final MetaDataIndexStateService indexStateService;
4953
private final DestructiveOperations destructiveOperations;
5054

server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package org.elasticsearch.action.admin.indices.settings.put;
2121

22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2224
import org.apache.logging.log4j.message.ParameterizedMessage;
2325
import org.elasticsearch.action.ActionListener;
2426
import org.elasticsearch.action.support.ActionFilters;
@@ -42,6 +44,8 @@
4244

4345
public class TransportUpdateSettingsAction extends TransportMasterNodeAction<UpdateSettingsRequest, AcknowledgedResponse> {
4446

47+
private static final Logger logger = LogManager.getLogger(TransportUpdateSettingsAction.class);
48+
4549
private final MetaDataUpdateSettingsService updateSettingsService;
4650

4751
@Inject

server/src/main/java/org/elasticsearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package org.elasticsearch.action.admin.indices.shards;
2020

21+
import org.apache.logging.log4j.LogManager;
2122
import org.apache.logging.log4j.Logger;
2223
import org.apache.lucene.util.CollectionUtil;
2324
import org.elasticsearch.action.ActionListener;
@@ -66,6 +67,8 @@
6667
public class TransportIndicesShardStoresAction
6768
extends TransportMasterNodeReadAction<IndicesShardStoresRequest, IndicesShardStoresResponse> {
6869

70+
private static final Logger logger = LogManager.getLogger(TransportIndicesShardStoresAction.class);
71+
6972
private final TransportNodesListGatewayStartedShards listShardStoresInfo;
7073

7174
@Inject

server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919
package org.elasticsearch.action.admin.indices.template.delete;
2020

21+
import org.apache.logging.log4j.LogManager;
22+
import org.apache.logging.log4j.Logger;
2123
import org.apache.logging.log4j.message.ParameterizedMessage;
2224
import org.elasticsearch.action.ActionListener;
2325
import org.elasticsearch.action.support.ActionFilters;
@@ -42,6 +44,8 @@
4244
public class TransportDeleteIndexTemplateAction
4345
extends TransportMasterNodeAction<DeleteIndexTemplateRequest, AcknowledgedResponse> {
4446

47+
private static final Logger logger = LogManager.getLogger(TransportDeleteIndexTemplateAction.class);
48+
4549
private final MetaDataIndexTemplateService indexTemplateService;
4650

4751
@Inject

server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919
package org.elasticsearch.action.admin.indices.template.put;
2020

21+
import org.apache.logging.log4j.LogManager;
22+
import org.apache.logging.log4j.Logger;
2123
import org.apache.logging.log4j.message.ParameterizedMessage;
2224
import org.elasticsearch.action.ActionListener;
2325
import org.elasticsearch.action.support.ActionFilters;
@@ -44,6 +46,8 @@
4446
*/
4547
public class TransportPutIndexTemplateAction extends TransportMasterNodeAction<PutIndexTemplateRequest, AcknowledgedResponse> {
4648

49+
private static final Logger logger = LogManager.getLogger(TransportPutIndexTemplateAction.class);
50+
4751
private final MetaDataIndexTemplateService indexTemplateService;
4852
private final IndexScopedSettings indexScopedSettings;
4953

server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package org.elasticsearch.action.admin.indices.upgrade.post;
2121

22+
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2224
import org.apache.logging.log4j.message.ParameterizedMessage;
2325
import org.elasticsearch.action.ActionListener;
2426
import org.elasticsearch.action.support.ActionFilters;
@@ -40,6 +42,8 @@
4042

4143
public class TransportUpgradeSettingsAction extends TransportMasterNodeAction<UpgradeSettingsRequest, AcknowledgedResponse> {
4244

45+
private static final Logger logger = LogManager.getLogger(TransportUpgradeSettingsAction.class);
46+
4347
private final MetaDataUpdateSettingsService updateSettingsService;
4448

4549
@Inject

server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
public abstract class TransportMasterNodeAction<Request extends MasterNodeRequest<Request>, Response extends ActionResponse>
5959
extends HandledTransportAction<Request, Response> {
6060

61-
protected static final Logger logger = LogManager.getLogger(TransportMasterNodeAction.class);
61+
private static final Logger logger = LogManager.getLogger(TransportMasterNodeAction.class);
6262

6363
protected final ThreadPool threadPool;
6464
protected final TransportService transportService;

x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportUnfollowAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
package org.elasticsearch.xpack.ccr.action;
88

9+
import org.apache.logging.log4j.LogManager;
10+
import org.apache.logging.log4j.Logger;
911
import org.apache.logging.log4j.message.ParameterizedMessage;
1012
import org.elasticsearch.ElasticsearchException;
1113
import org.elasticsearch.ElasticsearchSecurityException;
@@ -48,6 +50,8 @@
4850

4951
public class TransportUnfollowAction extends TransportMasterNodeAction<UnfollowAction.Request, AcknowledgedResponse> {
5052

53+
private static final Logger logger = LogManager.getLogger(TransportUnfollowAction.class);
54+
5155
private final Client client;
5256

5357
@Inject

x-pack/plugin/frozen-indices/src/main/java/org/elasticsearch/xpack/frozen/action/TransportFreezeIndexAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
package org.elasticsearch.xpack.frozen.action;
77

8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
810
import org.apache.logging.log4j.message.ParameterizedMessage;
911
import org.elasticsearch.ResourceNotFoundException;
1012
import org.elasticsearch.action.ActionListener;
@@ -47,6 +49,8 @@
4749
public final class TransportFreezeIndexAction extends
4850
TransportMasterNodeAction<FreezeRequest, FreezeResponse> {
4951

52+
private static final Logger logger = LogManager.getLogger(TransportFreezeIndexAction.class);
53+
5054
private final DestructiveOperations destructiveOperations;
5155
private final MetaDataIndexStateService indexStateService;
5256

x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportPutLifecycleAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
package org.elasticsearch.xpack.ilm.action;
88

9+
import org.apache.logging.log4j.LogManager;
10+
import org.apache.logging.log4j.Logger;
911
import org.elasticsearch.action.ActionListener;
1012
import org.elasticsearch.action.support.ActionFilters;
1113
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -41,6 +43,8 @@
4143
*/
4244
public class TransportPutLifecycleAction extends TransportMasterNodeAction<Request, Response> {
4345

46+
private static final Logger logger = LogManager.getLogger(TransportPutLifecycleAction.class);
47+
4448
@Inject
4549
public TransportPutLifecycleAction(TransportService transportService, ClusterService clusterService, ThreadPool threadPool,
4650
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {

x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportRetryAction.java

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
package org.elasticsearch.xpack.ilm.action;
88

9+
import org.apache.logging.log4j.LogManager;
10+
import org.apache.logging.log4j.Logger;
911
import org.elasticsearch.action.ActionListener;
1012
import org.elasticsearch.action.support.ActionFilters;
1113
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -31,6 +33,8 @@
3133

3234
public class TransportRetryAction extends TransportMasterNodeAction<Request, Response> {
3335

36+
private static final Logger logger = LogManager.getLogger(TransportRetryAction.class);
37+
3438
IndexLifecycleService indexLifecycleService;
3539

3640
@Inject

0 commit comments

Comments
 (0)