Skip to content

Commit aa70c41

Browse files
authored
[test] Always assume that the old cluster support replication of closed indices (#114314)
Support for replicating closed indices was added in #39506 (7.1.0), we can expect the the cluster always supports replication of closed indices in 8.0/9.0
1 parent 530d150 commit aa70c41

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

Diff for: qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/FullClusterRestartIT.java

+2-10
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.elasticsearch.common.xcontent.support.XContentMapValues;
2828
import org.elasticsearch.core.Booleans;
2929
import org.elasticsearch.core.CheckedFunction;
30-
import org.elasticsearch.core.UpdateForV9;
3130
import org.elasticsearch.index.IndexSettings;
3231
import org.elasticsearch.index.IndexVersion;
3332
import org.elasticsearch.index.IndexVersions;
@@ -1203,15 +1202,8 @@ public void testClosedIndices() throws Exception {
12031202
closeIndex(index);
12041203
}
12051204

1206-
@UpdateForV9(owner = UpdateForV9.Owner.DISTRIBUTED_INDEXING) // This check can be removed (always assume true)
1207-
var originalClusterSupportsReplicationOfClosedIndices = oldClusterHasFeature(RestTestLegacyFeatures.REPLICATION_OF_CLOSED_INDICES);
1208-
1209-
if (originalClusterSupportsReplicationOfClosedIndices) {
1210-
ensureGreenLongWait(index);
1211-
assertClosedIndex(index, true);
1212-
} else {
1213-
assertClosedIndex(index, false);
1214-
}
1205+
ensureGreenLongWait(index);
1206+
assertClosedIndex(index, true);
12151207

12161208
if (isRunningAgainstOldCluster() == false) {
12171209
openIndex(index);

0 commit comments

Comments
 (0)