diff --git a/server/src/main/java/org/elasticsearch/ElasticsearchException.java b/server/src/main/java/org/elasticsearch/ElasticsearchException.java index 109583d024790..5d7e7a0b67c74 100644 --- a/server/src/main/java/org/elasticsearch/ElasticsearchException.java +++ b/server/src/main/java/org/elasticsearch/ElasticsearchException.java @@ -741,8 +741,7 @@ private enum ElasticsearchExceptionHandle { org.elasticsearch.action.search.ReduceSearchPhaseException::new, 8, UNKNOWN_VERSION_ADDED), NODE_CLOSED_EXCEPTION(org.elasticsearch.node.NodeClosedException.class, org.elasticsearch.node.NodeClosedException::new, 9, UNKNOWN_VERSION_ADDED), - SNAPSHOT_FAILED_ENGINE_EXCEPTION(org.elasticsearch.index.engine.SnapshotFailedEngineException.class, - org.elasticsearch.index.engine.SnapshotFailedEngineException::new, 10, UNKNOWN_VERSION_ADDED), + // 10 was for SnapshotFailedEngineException, never instantiated in 6.2.0+ and never thrown across clusters SHARD_NOT_FOUND_EXCEPTION(org.elasticsearch.index.shard.ShardNotFoundException.class, org.elasticsearch.index.shard.ShardNotFoundException::new, 11, UNKNOWN_VERSION_ADDED), CONNECT_TRANSPORT_EXCEPTION(org.elasticsearch.transport.ConnectTransportException.class, @@ -810,8 +809,7 @@ private enum ElasticsearchExceptionHandle { org.elasticsearch.indices.recovery.RecoveryFailedException::new, 44, UNKNOWN_VERSION_ADDED), INDEX_SHARD_RELOCATED_EXCEPTION(org.elasticsearch.index.shard.IndexShardRelocatedException.class, org.elasticsearch.index.shard.IndexShardRelocatedException::new, 45, UNKNOWN_VERSION_ADDED), - NODE_SHOULD_NOT_CONNECT_EXCEPTION(org.elasticsearch.transport.NodeShouldNotConnectException.class, - org.elasticsearch.transport.NodeShouldNotConnectException::new, 46, UNKNOWN_VERSION_ADDED), + // 46 was for NodeShouldNotConnectException, never instantiated in 5.0+ // 47 used to be for IndexTemplateAlreadyExistsException which was deprecated in 5.1 removed in 6.0 TRANSLOG_CORRUPTED_EXCEPTION(org.elasticsearch.index.translog.TranslogCorruptedException.class, org.elasticsearch.index.translog.TranslogCorruptedException::new, 48, UNKNOWN_VERSION_ADDED), @@ -841,8 +839,7 @@ private enum ElasticsearchExceptionHandle { ALIAS_FILTER_PARSING_EXCEPTION(org.elasticsearch.indices.AliasFilterParsingException.class, org.elasticsearch.indices.AliasFilterParsingException::new, 63, UNKNOWN_VERSION_ADDED), // 64 was DeleteByQueryFailedEngineException, which was removed in 5.0 - GATEWAY_EXCEPTION(org.elasticsearch.gateway.GatewayException.class, org.elasticsearch.gateway.GatewayException::new, 65, - UNKNOWN_VERSION_ADDED), + // 65 was for GatewayException, never instantiated in 5.0+ INDEX_SHARD_NOT_RECOVERING_EXCEPTION(org.elasticsearch.index.shard.IndexShardNotRecoveringException.class, org.elasticsearch.index.shard.IndexShardNotRecoveringException::new, 66, UNKNOWN_VERSION_ADDED), HTTP_EXCEPTION(org.elasticsearch.http.HttpException.class, org.elasticsearch.http.HttpException::new, 67, UNKNOWN_VERSION_ADDED), diff --git a/server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java index 5894dce9c6296..a37c6ef7aeb96 100644 --- a/server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java @@ -37,7 +37,6 @@ import org.elasticsearch.tasks.Task; import org.elasticsearch.tasks.TaskCancelledException; import org.elasticsearch.tasks.TaskId; -import org.elasticsearch.transport.NodeShouldNotConnectException; import org.elasticsearch.transport.TransportChannel; import org.elasticsearch.transport.TransportException; import org.elasticsearch.transport.TransportRequest; @@ -360,9 +359,7 @@ protected void onNodeResponse(DiscoveryNode node, int nodeIndex, NodeResponse re protected void onNodeFailure(DiscoveryNode node, int nodeIndex, Throwable t) { String nodeId = node.getId(); - if (logger.isDebugEnabled() && (t instanceof NodeShouldNotConnectException) == false) { - logger.debug(new ParameterizedMessage("failed to execute [{}] on node [{}]", actionName, nodeId), t); - } + logger.debug(new ParameterizedMessage("failed to execute [{}] on node [{}]", actionName, nodeId), t); // this is defensive to protect against the possibility of double invocation // the current implementation of TransportService#sendRequest guards against this diff --git a/server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java b/server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java index 7f83785178331..9f64e06fbcc6d 100644 --- a/server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java @@ -20,7 +20,6 @@ import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.tasks.Task; import org.elasticsearch.threadpool.ThreadPool; -import org.elasticsearch.transport.NodeShouldNotConnectException; import org.elasticsearch.transport.TransportChannel; import org.elasticsearch.transport.TransportException; import org.elasticsearch.transport.TransportRequest; @@ -247,9 +246,7 @@ private void onOperation(int idx, NodeResponse nodeResponse) { } private void onFailure(int idx, String nodeId, Throwable t) { - if (logger.isDebugEnabled() && (t instanceof NodeShouldNotConnectException) == false) { - logger.debug(new ParameterizedMessage("failed to execute on node [{}]", nodeId), t); - } + logger.debug(new ParameterizedMessage("failed to execute on node [{}]", nodeId), t); responses.set(idx, new FailedNodeException(nodeId, "Failed node [" + nodeId + "]", t)); if (counter.incrementAndGet() == responses.length()) { finishHim(); diff --git a/server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java b/server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java index fa4d972fce464..8195a4f2dfc1e 100644 --- a/server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java @@ -27,7 +27,6 @@ import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.util.concurrent.AtomicArray; import org.elasticsearch.tasks.Task; -import org.elasticsearch.transport.NodeShouldNotConnectException; import org.elasticsearch.transport.TransportChannel; import org.elasticsearch.transport.TransportException; import org.elasticsearch.transport.TransportRequest; @@ -279,9 +278,7 @@ private void onOperation(int idx, NodeTasksResponse nodeResponse) { } private void onFailure(int idx, String nodeId, Throwable t) { - if (logger.isDebugEnabled() && (t instanceof NodeShouldNotConnectException) == false) { - logger.debug(new ParameterizedMessage("failed to execute on node [{}]", nodeId), t); - } + logger.debug(new ParameterizedMessage("failed to execute on node [{}]", nodeId), t); responses.set(idx, new FailedNodeException(nodeId, "Failed node [" + nodeId + "]", t)); diff --git a/server/src/main/java/org/elasticsearch/gateway/Gateway.java b/server/src/main/java/org/elasticsearch/gateway/Gateway.java index db05c99fc16b2..e91b8a5899da0 100644 --- a/server/src/main/java/org/elasticsearch/gateway/Gateway.java +++ b/server/src/main/java/org/elasticsearch/gateway/Gateway.java @@ -37,7 +37,7 @@ public Gateway(final ClusterService clusterService, final NodeClient client) { this.client = client; } - public void performStateRecovery(final GatewayStateRecoveredListener listener) throws GatewayException { + public void performStateRecovery(final GatewayStateRecoveredListener listener) { final String[] nodesIds = clusterService.state().nodes().getMasterNodes().keys().toArray(String.class); logger.trace("performing state recovery from {}", Arrays.toString(nodesIds)); var request = new TransportNodesListGatewayMetaState.Request(nodesIds); diff --git a/server/src/main/java/org/elasticsearch/gateway/GatewayException.java b/server/src/main/java/org/elasticsearch/gateway/GatewayException.java deleted file mode 100644 index be3718f79f4db..0000000000000 --- a/server/src/main/java/org/elasticsearch/gateway/GatewayException.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -package org.elasticsearch.gateway; - -import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.common.io.stream.StreamInput; - -import java.io.IOException; - -public class GatewayException extends ElasticsearchException { - - public GatewayException(StreamInput in) throws IOException { - super(in); - } -} diff --git a/server/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java b/server/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java deleted file mode 100644 index fa471aa0d3466..0000000000000 --- a/server/src/main/java/org/elasticsearch/index/engine/SnapshotFailedEngineException.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -package org.elasticsearch.index.engine; - -import org.elasticsearch.common.io.stream.StreamInput; - -import java.io.IOException; - -public class SnapshotFailedEngineException extends EngineException { - - public SnapshotFailedEngineException(StreamInput in) throws IOException{ - super(in); - } -} diff --git a/server/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java b/server/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java deleted file mode 100644 index 64beb6baadc3e..0000000000000 --- a/server/src/main/java/org/elasticsearch/transport/NodeShouldNotConnectException.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -package org.elasticsearch.transport; - -import org.elasticsearch.common.io.stream.StreamInput; - -import java.io.IOException; - -public class NodeShouldNotConnectException extends NodeNotConnectedException { - - public NodeShouldNotConnectException(StreamInput in) throws IOException { - super(in); - } -} diff --git a/server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java b/server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java index 7006d3cfe0f45..030731698e9f5 100644 --- a/server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java +++ b/server/src/test/java/org/elasticsearch/ExceptionSerializationTests.java @@ -673,7 +673,7 @@ public void testIds() { ids.put(7, org.elasticsearch.http.BindHttpException.class); ids.put(8, org.elasticsearch.action.search.ReduceSearchPhaseException.class); ids.put(9, org.elasticsearch.node.NodeClosedException.class); - ids.put(10, org.elasticsearch.index.engine.SnapshotFailedEngineException.class); + ids.put(10, null); // SnapshotFailedEngineException, never instantiated in 6.2.0+ and never thrown across clusters ids.put(11, org.elasticsearch.index.shard.ShardNotFoundException.class); ids.put(12, org.elasticsearch.transport.ConnectTransportException.class); ids.put(13, org.elasticsearch.transport.NotSerializableTransportException.class); @@ -709,7 +709,7 @@ public void testIds() { ids.put(43, org.elasticsearch.index.translog.TruncatedTranslogException.class); ids.put(44, org.elasticsearch.indices.recovery.RecoveryFailedException.class); ids.put(45, org.elasticsearch.index.shard.IndexShardRelocatedException.class); - ids.put(46, org.elasticsearch.transport.NodeShouldNotConnectException.class); + ids.put(46, null); // NodeShouldNotConnectException, never instantiated in 5.0+ ids.put(47, null); ids.put(48, org.elasticsearch.index.translog.TranslogCorruptedException.class); ids.put(49, org.elasticsearch.cluster.block.ClusterBlockException.class); @@ -728,7 +728,7 @@ public void testIds() { ids.put(62, org.elasticsearch.common.io.stream.NotSerializableExceptionWrapper.class); ids.put(63, org.elasticsearch.indices.AliasFilterParsingException.class); ids.put(64, null); // DeleteByQueryFailedEngineException was removed in 3.0 - ids.put(65, org.elasticsearch.gateway.GatewayException.class); + ids.put(65, null); // GatewayException, never instantiated in 5.0+ ids.put(66, org.elasticsearch.index.shard.IndexShardNotRecoveringException.class); ids.put(67, org.elasticsearch.http.HttpException.class); ids.put(68, org.elasticsearch.ElasticsearchException.class);