honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing build failures after Flavor Serialization backport (#1867) 

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
This commit is contained in:
Andriy Redko 2022-01-07 19:43:56 -05:00 committed by GitHub
parent 1bb8864178
commit c71ff87303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/org/opensearch/Build.java
View File

@ -214,8 +214,7 @@ public class Build {
// 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
// todo change to V_1_3_0 after backporting
if (in.getVersion().before(Version.V_2_0_0)) {
if (in.getVersion().before(Version.V_1_3_0)) {
String flavor = in.readString();
}
// be lenient when reading on the wire, the enumeration values from other versions might be different than what we know
@ -242,8 +241,7 @@ public class Build {
// The following block is kept for existing BWS tests to pass.
// TODO - clean up this code when we remove all v6 bwc tests.
// TODO - clean this up when OSS flavor is removed in all of the code base
// todo change to V_1_3_0 after backporting
if (out.getVersion().before(Version.V_2_0_0)) {
if (out.getVersion().before(Version.V_1_3_0)) {
out.writeString("oss");
}
final Type buildType = build.type();