Skip to content

Commit 96b4f3d

Browse files
authored
Add yet more logging around index creation (#46431)
Further investigation into #46091, expanding on #46363, to add even more detailed logging around the retry behaviour during index creation.
1 parent f033c3f commit 96b4f3d

File tree

36 files changed

+166
-6
lines changed

36 files changed

+166
-6
lines changed

buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -965,8 +965,15 @@ private void createConfiguration() {
965965
defaultConfig.put("discovery.initial_state_timeout", "0s");
966966

967967
// TODO: Remove these once https://github.com/elastic/elasticsearch/issues/46091 is fixed
968-
defaultConfig.put("logger.org.elasticsearch.action.support.master", "DEBUG");
968+
defaultConfig.put("logger.org.elasticsearch.action.support.master.TransportMasterNodeAction", "TRACE");
969+
defaultConfig.put("logger.org.elasticsearch.cluster.metadata.MetaDataCreateIndexService", "TRACE");
970+
defaultConfig.put("logger.org.elasticsearch.cluster.service", "DEBUG");
969971
defaultConfig.put("logger.org.elasticsearch.cluster.coordination", "DEBUG");
972+
defaultConfig.put("logger.org.elasticsearch.gateway.MetaStateService", "TRACE");
973+
if (getVersion().getMajor() >= 8) {
974+
defaultConfig.put("cluster.service.slow_task_logging_threshold", "5s");
975+
defaultConfig.put("cluster.service.slow_master_task_logging_threshold", "5s");
976+
}
970977

971978
HashSet<String> overriden = new HashSet<>(defaultConfig.keySet());
972979
overriden.retainAll(settings.keySet());

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;
@@ -56,6 +58,8 @@
5658
public class TransportClusterAllocationExplainAction
5759
extends TransportMasterNodeAction<ClusterAllocationExplainRequest, ClusterAllocationExplainResponse> {
5860

61+
private static final Logger logger = LogManager.getLogger(TransportClusterAllocationExplainAction.class);
62+
5963
private final ClusterInfoService clusterInfoService;
6064
private final AllocationDeciders allocationDeciders;
6165
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;
@@ -53,6 +55,8 @@
5355
public class TransportAddVotingConfigExclusionsAction extends TransportMasterNodeAction<AddVotingConfigExclusionsRequest,
5456
AddVotingConfigExclusionsResponse> {
5557

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

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;
@@ -49,6 +51,8 @@
4951
public class TransportClearVotingConfigExclusionsAction
5052
extends TransportMasterNodeAction<ClearVotingConfigExclusionsRequest, ClearVotingConfigExclusionsResponse> {
5153

54+
private static final Logger logger = LogManager.getLogger(TransportClearVotingConfigExclusionsAction.class);
55+
5256
@Inject
5357
public TransportClearVotingConfigExclusionsAction(TransportService transportService, ClusterService clusterService,
5458
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;
@@ -47,6 +49,8 @@
4749
public class TransportClusterUpdateSettingsAction extends
4850
TransportMasterNodeAction<ClusterUpdateSettingsRequest, ClusterUpdateSettingsResponse> {
4951

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

5256
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;
@@ -62,6 +64,8 @@
6264

6365
public class TransportSnapshotsStatusAction extends TransportMasterNodeAction<SnapshotsStatusRequest, SnapshotsStatusResponse> {
6466

67+
private static final Logger logger = LogManager.getLogger(TransportSnapshotsStatusAction.class);
68+
6569
private final SnapshotsService snapshotsService;
6670

6771
private final NodeClient client;

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;
@@ -39,6 +41,8 @@
3941
public class TransportPendingClusterTasksAction
4042
extends TransportMasterNodeReadAction<PendingClusterTasksRequest, PendingClusterTasksResponse> {
4143

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

4448
@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;
@@ -61,6 +63,8 @@
6163
*/
6264
public class TransportIndicesAliasesAction extends TransportMasterNodeAction<IndicesAliasesRequest, AcknowledgedResponse> {
6365

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

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/create/CreateIndexClusterStateUpdateRequest.java

+15
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,19 @@ public boolean copySettings() {
147147
return copySettings;
148148
}
149149

150+
@Override
151+
public String toString() {
152+
return "CreateIndexClusterStateUpdateRequest{" +
153+
"cause='" + cause + '\'' +
154+
", index='" + index + '\'' +
155+
", providedName='" + providedName + '\'' +
156+
", recoverFrom=" + recoverFrom +
157+
", resizeType=" + resizeType +
158+
", copySettings=" + copySettings +
159+
", settings=" + settings +
160+
", aliases=" + aliases +
161+
", blocks=" + blocks +
162+
", waitForActiveShards=" + waitForActiveShards +
163+
'}';
164+
}
150165
}

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;
@@ -49,6 +51,8 @@
4951
*/
5052
public class TransportPutMappingAction extends TransportMasterNodeAction<PutMappingRequest, AcknowledgedResponse> {
5153

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

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;
@@ -43,6 +45,8 @@
4345

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

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

4852
@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;
@@ -70,6 +71,8 @@
7071
public class TransportIndicesShardStoresAction
7172
extends TransportMasterNodeReadAction<IndicesShardStoresRequest, IndicesShardStoresResponse> {
7273

74+
private static final Logger logger = LogManager.getLogger(TransportIndicesShardStoresAction.class);
75+
7376
private final NodeClient client;
7477

7578
@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;
@@ -43,6 +45,8 @@
4345
public class TransportDeleteIndexTemplateAction
4446
extends TransportMasterNodeAction<DeleteIndexTemplateRequest, AcknowledgedResponse> {
4547

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

4852
@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;
@@ -45,6 +47,8 @@
4547
*/
4648
public class TransportPutIndexTemplateAction extends TransportMasterNodeAction<PutIndexTemplateRequest, AcknowledgedResponse> {
4749

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

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;
@@ -41,6 +43,8 @@
4143

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

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

4650
@Inject

0 commit comments

Comments
 (0)