From 37abc411dc2a46b871cc8d5a6d6bb192ce44104a Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Tue, 7 Apr 2020 19:16:13 +0200 Subject: [PATCH] Remove Unused Snapshot Status Values (#54893) (#54906) * Remove Unused Snapshot Status Values This is a left-over from before #41940 when we used the same status enum for the shards and the snapshots overall. The two removed values were never used on the shard level so we can simply remove them here. --- .../org/elasticsearch/cluster/SnapshotsInProgress.java | 8 +------- .../org/elasticsearch/cluster/ClusterStateDiffIT.java | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java b/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java index 46f092d3bc508..7e06577ac58d7 100644 --- a/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java +++ b/server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java @@ -427,9 +427,7 @@ public enum State { STARTED((byte) 1, false), SUCCESS((byte) 2, true), FAILED((byte) 3, true), - ABORTED((byte) 4, false), - MISSING((byte) 5, true), - WAITING((byte) 6, false); + ABORTED((byte) 4, false); private final byte value; @@ -460,10 +458,6 @@ public static State fromValue(byte value) { return FAILED; case 4: return ABORTED; - case 5: - return MISSING; - case 6: - return WAITING; default: throw new IllegalArgumentException("No snapshot state for value [" + value + "]"); } diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java b/server/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java index 7d98507ec0891..fc3c1119471ce 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java +++ b/server/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java @@ -716,7 +716,7 @@ public ClusterState.Custom randomCreate(String name) { new Snapshot(randomName("repo"), new SnapshotId(randomName("snap"), UUIDs.randomBase64UUID())), randomBoolean(), randomBoolean(), - SnapshotsInProgress.State.fromValue((byte) randomIntBetween(0, 6)), + randomFrom(SnapshotsInProgress.State.values()), Collections.emptyList(), Math.abs(randomLong()), (long) randomIntBetween(0, 1000),