diff --git a/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java index 7ace0303f67c6..741350966a57f 100644 --- a/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java +++ b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotException.java @@ -33,11 +33,6 @@ public IndexShardSnapshotException(ShardId shardId, String msg) { this(shardId, msg, null); } - public IndexShardSnapshotException(ShardId shardId, Throwable cause) { - super(cause); - setShard(shardId); - } - public IndexShardSnapshotException(ShardId shardId, String msg, Throwable cause) { super(msg, cause); setShard(shardId); diff --git a/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java index 7b7fc68d4d440..bfb755c9e14f5 100644 --- a/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java +++ b/server/src/main/java/org/elasticsearch/index/snapshots/IndexShardSnapshotFailedException.java @@ -32,10 +32,6 @@ public IndexShardSnapshotFailedException(ShardId shardId, String msg) { super(shardId, msg); } - public IndexShardSnapshotFailedException(ShardId shardId, Throwable cause) { - super(shardId, cause); - } - public IndexShardSnapshotFailedException(ShardId shardId, String msg, Throwable cause) { super(shardId, msg, cause); } diff --git a/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java index 00029f8ef33a2..4fcf36b225bb1 100644 --- a/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java +++ b/server/src/main/java/org/elasticsearch/snapshots/SnapshotsService.java @@ -362,8 +362,7 @@ public ClusterState execute(ClusterState currentState) { final List indexIds = repositoryData.resolveNewIndices(indices); final List dataStreams = indexNameExpressionResolver.dataStreamNames(currentState, request.indicesOptions(), request.indices()); - final Version version = minCompatibleVersion( - clusterService.state().nodes().getMinNodeVersion(), repositoryData, null); + final Version version = minCompatibleVersion(currentState.nodes().getMinNodeVersion(), repositoryData, null); ImmutableOpenMap shards = shards(currentState, indexIds, useShardGenerations(version), repositoryData); if (request.partial() == false) { diff --git a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java index 3e81f15bfd8d9..51e9b3cf538ce 100644 --- a/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/elasticsearch/snapshots/SnapshotResiliencyTests.java @@ -615,14 +615,6 @@ public void testBulkSnapshotDeleteWithAbort() { Collection snapshotIds = getRepositoryData(repository).getSnapshotIds(); // No snapshots should be left in the repository assertThat(snapshotIds, empty()); - - for (SnapshotId snapshotId : snapshotIds) { - final SnapshotInfo snapshotInfo = repository.getSnapshotInfo(snapshotId); - assertEquals(SnapshotState.SUCCESS, snapshotInfo.state()); - assertThat(snapshotInfo.indices(), containsInAnyOrder(index)); - assertEquals(shards, snapshotInfo.successfulShards()); - assertEquals(0, snapshotInfo.failedShards()); - } } public void testConcurrentSnapshotRestoreAndDeleteOther() {