Fixing SearchStats (de)serialization (caused by opensearch-project#4616)

Signed-off-by: Andriy Redko <[email protected]>
reta · Oct 6, 2022 · 53a206b · 53a206b
1 parent ed359f0
commit 53a206b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -119,6 +119,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Attempt to fix Github workflow for Gradle Check job ([#4679](https://github.com/opensearch-project/OpenSearch/pull/4679))
 - Fix flaky DecommissionControllerTests.testTimesOut ([4683](https://github.com/opensearch-project/OpenSearch/pull/4683))
 - Fix new race condition in DecommissionControllerTests ([4688](https://github.com/opensearch-project/OpenSearch/pull/4688))
+- Fix SearchStats (de)serialization (caused by https://github.com/opensearch-project/OpenSearch/pull/4616) ([#4697](https://github.com/opensearch-project/OpenSearch/pull/4697))
 
 ### Security
 

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
@@ -1,14 +1,14 @@
 ---
 "Help":
   - skip:
-      version: " - 2.9.99"
-      reason:  point in time stats were added in 3.0.0
+      version: " - 2.3.99"
+      reason:  point in time stats were added in 2.4.0
       features: node_selector
   - do:
       cat.shards:
         help: true
       node_selector:
-        version: "3.0.0 - "
+        version: "2.4.0 - "
 
   - match:
       $body: |
@@ -88,16 +88,16 @@
                     path.state                       .+   \n
                $/
 ---
-"Help before - 3.0.0":
+"Help before - 2.4.0":
   - skip:
-      version: "3.0.0 - "
-      reason:  point in time stats were added in 3.0.0
+      version: "2.4.0 - "
+      reason:  point in time stats were added in 2.4.0
       features: node_selector
   - do:
       cat.shards:
         help: true
       node_selector:
-        version: " - 2.9.99"
+        version: " - 2.3.99"
 
   - match:
       $body: |

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/pit/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/pit/10_basic.yml
@@ -1,7 +1,7 @@
 "Create PIT, Search with PIT ID and Delete":
   - skip:
-      version: " - 2.9.99"
-      reason: "mode to be introduced later than 3.0"
+      version: " - 2.3.99"
+      reason: "mode to be introduced later than 2.4.0"
   - do:
       indices.create:
         index: test_pit

diff --git a/server/src/main/java/org/opensearch/index/search/stats/SearchStats.java b/server/src/main/java/org/opensearch/index/search/stats/SearchStats.java
@@ -141,7 +141,7 @@ private Stats(StreamInput in) throws IOException {
             suggestTimeInMillis = in.readVLong();
             suggestCurrent = in.readVLong();
 
-            if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+            if (in.getVersion().onOrAfter(Version.V_2_4_0)) {
                 pitCount = in.readVLong();
                 pitTimeInMillis = in.readVLong();
                 pitCurrent = in.readVLong();
@@ -292,7 +292,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeVLong(suggestTimeInMillis);
             out.writeVLong(suggestCurrent);
 
-            if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+            if (out.getVersion().onOrAfter(Version.V_2_4_0)) {
                 out.writeVLong(pitCount);
                 out.writeVLong(pitTimeInMillis);
                 out.writeVLong(pitCurrent);