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

Fixing transport deserialization with oss distribution (#218) 

Signed-off-by: Sarat Vemulapalli <vemsarat@amazon.com>
Signed-off-by: Peter Nied <petern@amazon.com>
This commit is contained in:
Sarat Vemulapalli 2021-03-05 11:22:35 -08:00 committed by Peter Nied
parent 7f983a95a6
commit eff46fb930
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/main/java/org/elasticsearch/Build.java
View File

@ -186,7 +186,10 @@ public class Build {
final Type type;
// The following block is kept for existing BWS tests to pass.
// TODO - clean up this code when we remove all v6 bwc tests.
if (in.getVersion().onOrAfter(Version.V_6_3_0) && in.getVersion().onOrBefore(Version.V_7_0_0)) {
// 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(Version.V_6_3_0)) {
flavor = in.readString();
}
if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
@ -211,7 +214,9 @@ public class Build {
public static void writeBuild(Build build, StreamOutput out) throws IOException {
// The following block is kept for existing BWS tests to pass.
// TODO - clean up this code when we remove all v6 bwc tests.
if (out.getVersion().onOrAfter(Version.V_6_3_0) && out.getVersion().onOrBefore(Version.V_7_0_0)) {
// TODO - clean this up when OSS flavor is removed in all of the code base
// See issue: https://github.com/opendistro-for-elasticsearch/search/issues/159
if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
out.writeString("oss");
}
if (out.getVersion().onOrAfter(Version.V_6_3_0)) {