Skip to content

Commit ace446f

Browse files
committed
Update shrink's bwc version to 6.1.0 and enabled bwc tests
1 parent 148376c commit ace446f

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ task verifyVersions {
186186
* after the backport of the backcompat code is complete.
187187
*/
188188
allprojects {
189-
ext.bwc_tests_enabled = false
189+
ext.bwc_tests_enabled = true
190190
}
191191

192192
task verifyBwcTestsEnabled {

core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ResizeAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class ResizeAction extends Action<ResizeRequest, ResizeResponse, ResizeRe
2727

2828
public static final ResizeAction INSTANCE = new ResizeAction();
2929
public static final String NAME = "indices:admin/resize";
30-
public static final Version COMPATIBILITY_VERSION = Version.V_7_0_0_alpha1; // TODO remove this once it's backported
30+
public static final Version COMPATIBILITY_VERSION = Version.V_6_1_0; // TODO remove this once it's backported
3131

3232
private ResizeAction() {
3333
super(NAME);

core/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.elasticsearch.cluster.routing.allocation;
2020

2121
import org.elasticsearch.Version;
22+
import org.elasticsearch.action.admin.indices.shrink.ResizeAction;
2223
import org.elasticsearch.cluster.ClusterName;
2324
import org.elasticsearch.cluster.ClusterState;
2425
import org.elasticsearch.cluster.ESAllocationTestCase;
@@ -245,7 +246,7 @@ public void testSourcePrimaryActive() {
245246

246247
public void testAllocateOnOldNode() {
247248
Version version = VersionUtils.randomVersionBetween(random(), Version.V_5_0_0,
248-
VersionUtils.getPreviousVersion(Version.V_7_0_0_alpha1));
249+
VersionUtils.getPreviousVersion(ResizeAction.COMPATIBILITY_VERSION));
249250
ClusterState clusterState = createInitialClusterState(true, version);
250251
MetaData.Builder metaBuilder = MetaData.builder(clusterState.metaData());
251252
metaBuilder.put(IndexMetaData.builder("target").settings(settings(Version.CURRENT)

rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/10_basic.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
"Split index via API":
33
- skip:
4-
version: " - 6.99.99"
5-
reason: Added in 7.0.0
4+
version: " - 6.0.99"
5+
reason: Added in 6.1.0
66
- do:
77
indices.create:
88
index: source

rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/20_source_mapping.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
"Split index ignores target template mapping":
33
- skip:
4-
version: " - 6.99.99"
5-
reason: added in 7.0.0
4+
version: " - 6.0.99"
5+
reason: Added in 6.1.0
66

77
# create index
88
- do:

0 commit comments

Comments
 (0)