Remove version check for snapshot preserve causing issues with version upgrades (#3684)

kotwanikunal · web-flow · commit 877d733813ce · 2022-06-23T16:53:52.000-07:00
diff --git a/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java b/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java
@@ -656,7 +656,7 @@ protected static void wipeDataStreams() throws IOException {
                     // Since the snapshots are shared within the cluster, another parallel run may delete all
                     // snapshots in the repository.
                     // For now we hack to prevent deletion of snapshots prefixed with "force_preserve"
-                    if (Version.CURRENT.onOrBefore(Version.V_2_1_0) && name.startsWith("force_preserve")) {
+                    if (name.startsWith("force_preserve")) {
                         continue;
                     }
                     if (SnapshotState.valueOf((String) snapshotInfo.get("state")).completed() == false) {

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,7 @@ protected static void wipeDataStreams() throws IOException {`
`656`	`656`	`// Since the snapshots are shared within the cluster, another parallel run may delete all`
`657`	`657`	`// snapshots in the repository.`
`658`	`658`	`// For now we hack to prevent deletion of snapshots prefixed with "force_preserve"`
`659`		`- if (Version.CURRENT.onOrBefore(Version.V_2_1_0) && name.startsWith("force_preserve")) {`
	`659`	`+ if (name.startsWith("force_preserve")) {`
`660`	`660`	`continue;`
`661`	`661`	`}`
`662`	`662`	`if (SnapshotState.valueOf((String) snapshotInfo.get("state")).completed() == false) {`