Skip to content

Adjust serialization versions for migration metadata & re-enable BWC #79530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2021
Merged

Adjust serialization versions for migration metadata & re-enable BWC #79530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ tasks.register("verifyVersions") {
* after the backport of the backcompat code is complete.
*/

boolean bwc_tests_enabled = false
boolean bwc_tests_enabled = true
// place a PR link here when committing bwc changes:
String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/78951"
String bwc_tests_disabled_issue = ""
/*
* FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a
* JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/upgrades/FeatureMigrationResults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
*/
public class FeatureMigrationResults implements Metadata.Custom {
public static final String TYPE = "system_index_migration";
private static final Version MIGRATION_ADDED_VERSION = Version.V_8_0_0;
public static final Version MIGRATION_ADDED_VERSION = Version.V_8_0_0;

private static final ParseField RESULTS_FIELD = new ParseField("results");

Expand Down
4 changes: 3 additions & 1 deletion server/src/main/java/org/elasticsearch/upgrades/SystemIndexMigrationTaskParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

import java.io.IOException;

import static org.elasticsearch.upgrades.FeatureMigrationResults.MIGRATION_ADDED_VERSION;

/**
* The params used to initialize {@link SystemIndexMigrator} when it's initially kicked off.
*
Expand Down Expand Up @@ -62,7 +64,7 @@ public String getWriteableName() {

@Override
public Version getMinimalSupportedVersion() {
return Version.V_8_0_0;
return MIGRATION_ADDED_VERSION;
}

@Override public boolean equals(Object obj) {
Expand Down