Skip to content
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.

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

[1.x] Remove remaining Flavor Serialization (#1751) #1757

Merged

Conversation

nknize
Copy link
Collaborator

@nknize nknize commented Dec 16, 2021

This PR removes unnecessary serialization of unused flavor variable in build metadata from V_1_3_0+

This commit removes unnecessary serialization of unused flavor variable in build
metadata from V_1_3_0+

Signed-off-by: Nicholas Walter Knize <[email protected]>
This commit changes the flavor serialization check in Build from V_2_0_0 to
V_1_3_0.

Signed-off-by: Nicholas Walter Knize <[email protected]>
@nknize nknize added non-issue bugs / unexpected behaviors that end up non issues; audit trail simple changes that aren't issues backwards-compatibility v1.3.0 backport 1.x labels Dec 16, 2021
@nknize nknize changed the title [1.x] Remaining Flavor Serialization (#1751) [1.x] Remove reaining Flavor Serialization (#1751) Dec 16, 2021
@opensearch-ci-bot
Copy link
Collaborator

Can one of the admins verify this patch?

@nknize nknize changed the title [1.x] Remove reaining Flavor Serialization (#1751) [1.x] Remove remaining Flavor Serialization (#1751) Dec 16, 2021
@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success bfee122
Log 1555

Reports 1555

@@ -215,8 +214,8 @@ public static Build readBuild(StreamInput in) throws IOException {
// TODO - clean this up when OSS flavor is removed in all of the code base
// (Integ test zip still write OSS as distribution)
// See issue: https://github.com/opendistro-for-elasticsearch/search/issues/159
if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) {
flavor = in.readString();
if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0) && in.getVersion().before(Version.V_1_3_0)) {
Copy link
Member

@saratvemulapalli saratvemulapalli Jan 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trying to understand, can we just simply use Version.CURRENT?
It helps us avoid code changes after each bump.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BWC testing would fail... This is for reading off the wire from remote nodes between 6.3.0 and 1.3.0 excluded. (that covers all 1.2.x versions but 1.3.0 does not send flavor).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

THat makes sense. Thank you!

@saratvemulapalli saratvemulapalli merged commit 3f28311 into opensearch-project:1.x Jan 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backwards-compatibility non-issue bugs / unexpected behaviors that end up non issues; audit trail simple changes that aren't issues v1.3.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants