From 1860d7d49e991f154ed6af526082ca739dd05f90 Mon Sep 17 00:00:00 2001
From: Andriy Redko <andriy.redko@aiven.io>
Date: Fri, 2 Jun 2023 12:44:55 -0400
Subject: [PATCH] Concurrent Search Tasks Response Updates (update BWC
 versions) (#7889)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../test/tasks.list/10_basic.yml              | 36 +++++++++++++++++--
 .../opensearch/tasks/TaskResourceStats.java   |  4 +--
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml
index 685852a2c86b9..04c132de5bef2 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml
@@ -25,6 +25,35 @@
   - is_true: tasks.$task_id.resource_stats
   - is_true: tasks.$task_id.resource_stats.total
 
+---
+"tasks_list test detailed":
+  - skip:
+      features: [arbitrary_key]
+      version: " - 2.0.99"
+      reason: resource_stats were introduced in 2.1.0
+
+  - do:
+      nodes.info: {}
+  - set:
+      nodes._arbitrary_key_: node_id
+
+  - do:
+      tasks.list: {}
+
+  - is_true: nodes
+  - is_true: nodes.$node_id.roles
+
+  - do:
+      tasks.list:
+        group_by: parents
+        detailed: true
+  - set:
+      tasks._arbitrary_key_: task_id
+
+  - is_true: tasks
+  - is_true: tasks.$task_id.resource_stats
+  - is_true: tasks.$task_id.resource_stats.total
+
 ---
 "tasks_list headers":
   - skip:
@@ -39,10 +68,11 @@
   - match: { tasks.0.headers.X-Opaque-Id: "That is me" }
 
 ---
-"tasks_list detailed":
+"tasks_list detailed (with thread info)":
   - skip:
-      version: " - 2.99.99"
-      reason: thread_info was introduced in 3.0.0
+      version: " - 2.8.99"
+      reason: thread_info was introduced in 2.9.0
+      features: [arbitrary_key]
 
   - do:
       tasks.list:
diff --git a/server/src/main/java/org/opensearch/tasks/TaskResourceStats.java b/server/src/main/java/org/opensearch/tasks/TaskResourceStats.java
index 887b259210741..94eb9478403fd 100644
--- a/server/src/main/java/org/opensearch/tasks/TaskResourceStats.java
+++ b/server/src/main/java/org/opensearch/tasks/TaskResourceStats.java
@@ -47,7 +47,7 @@ public TaskResourceStats(Map<String, TaskResourceUsage> resourceUsage, TaskThrea
      */
     public TaskResourceStats(StreamInput in) throws IOException {
         resourceUsage = in.readMap(StreamInput::readString, TaskResourceUsage::readFromStream);
-        if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_2_9_0)) {
             threadUsage = TaskThreadUsage.readFromStream(in);
         } else {
             // Initialize TaskThreadUsage in case it is not found in mixed cluster case
@@ -58,7 +58,7 @@ public TaskResourceStats(StreamInput in) throws IOException {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeMap(resourceUsage, StreamOutput::writeString, (stream, stats) -> stats.writeTo(stream));
-        if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_2_9_0)) {
             threadUsage.writeTo(out);
         }
     }