[Search latency - Coordinator] Changing version check to 2.11 (opense…

…arch-project#10280) * [Search latency - Coordinator] Changing version check to 2.11 Signed-off-by: Sagar Upadhyaya <[email protected]> * [Port main] update version check as per v2.11.0 [Backport 2.x] Indexing: add Doc status counter (opensearch-project#10267) * Indexing: add Doc Status Counter (opensearch-project#8716) Currently, Opensearch returns a 200 OK response code for a Bulk API call, even though there can be partial/complete failures within the request E2E. This provides doc level stats with respect to the rest status code as 2xx, 4xx, 5xx etc. Signed-off-by: Rohit Ashiwal <[email protected]> (cherry picked from commit d656e3d) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> (cherry picked from commit 94173e3) Signed-off-by: Rohit Ashiwal <[email protected]> Signed-off-by: Sagar Upadhyaya <[email protected]> --------- Signed-off-by: Sagar Upadhyaya <[email protected]> Signed-off-by: Rohit Ashiwal <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ticheng-aws · Sep 30, 2023 · be24766 · be24766
1 parent 61495bf
commit be24766
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml
@@ -141,8 +141,8 @@
 ---
 "Metric - indexing doc_status":
   - skip:
-      version: " - 2.99.99"
-      reason: "To be introduced in future release :: TODO: change if/when we backport to 2.x"
+      version: " - 2.10.99"
+      reason: "Doc Status Stats were introduced in v2.11.0"
   - do:
       nodes.info: {}
   - set:

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
@@ -242,7 +242,7 @@ private Stats(StreamInput in) throws IOException {
                 pitCurrent = in.readVLong();
             }
 
-            if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+            if (in.getVersion().onOrAfter(Version.V_2_11_0)) {
                 this.requestStatsLongHolder = new RequestStatsLongHolder();
                 requestStatsLongHolder.requestStatsHolder = in.readMap(StreamInput::readString, PhaseStatsLongHolder::new);
             }
@@ -437,7 +437,7 @@ public void writeTo(StreamOutput out) throws IOException {
                 out.writeVLong(pitCurrent);
             }
 
-            if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+            if (out.getVersion().onOrAfter(Version.V_2_11_0)) {
                 if (requestStatsLongHolder == null) {
                     requestStatsLongHolder = new RequestStatsLongHolder();
                 }

diff --git a/server/src/main/java/org/opensearch/index/shard/IndexingStats.java b/server/src/main/java/org/opensearch/index/shard/IndexingStats.java
@@ -172,7 +172,7 @@ public Stats(StreamInput in) throws IOException {
             isThrottled = in.readBoolean();
             throttleTimeInMillis = in.readLong();
 
-            if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+            if (in.getVersion().onOrAfter(Version.V_2_11_0)) {
                 docStatusStats = in.readOptionalWriteable(DocStatusStats::new);
             } else {
                 docStatusStats = null;
@@ -308,7 +308,7 @@ public void writeTo(StreamOutput out) throws IOException {
             out.writeBoolean(isThrottled);
             out.writeLong(throttleTimeInMillis);
 
-            if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+            if (out.getVersion().onOrAfter(Version.V_2_11_0)) {
                 out.writeOptionalWriteable(docStatusStats);
             }
         }