revert 6855

Signed-off-by: Rishikesh1159 <[email protected]>

CHANGELOG.md

@@ -12,7 +12,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add 'base_path' setting to File System Repository ([#6558](https://github.com/opensearch-project/OpenSearch/pull/6558))
 - Return success on DeletePits when no PITs exist. ([#6544](https://github.com/opensearch-project/OpenSearch/pull/6544))
 - Add node repurpose command for search nodes ([#6517](https://github.com/opensearch-project/OpenSearch/pull/6517))
-- Add wait_for_completion parameter to resize, open, and forcemerge APIs ([#6434](https://github.com/opensearch-project/OpenSearch/pull/6434))
 - [Segment Replication] Apply backpressure when replicas fall behind ([#6563](https://github.com/opensearch-project/OpenSearch/pull/6563))
 - [Remote Store] Integrate remote segment store in peer recovery flow ([#6664](https://github.com/opensearch-project/OpenSearch/pull/6664))
 - [Segment Replication] Add new cluster setting to set replication strategy by default for all indices in cluster. ([#6791](https://github.com/opensearch-project/OpenSearch/pull/6791))

modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractBaseReindexRestHandler.java

@@ -39,8 +39,11 @@
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.rest.BaseRestHandler;
+import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestRequest;
+import org.opensearch.rest.RestStatus;
 import org.opensearch.tasks.LoggingTaskListener;
+import org.opensearch.tasks.Task;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -121,6 +124,17 @@ protected Request setCommonOptions(RestRequest restRequest, Request request) {
         return request;
     }
 
+    private RestChannelConsumer sendTask(String localNodeId, Task task) {
+        return channel -> {
+            try (XContentBuilder builder = channel.newBuilder()) {
+                builder.startObject();
+                builder.field("task", localNodeId + ":" + task.getId());
+                builder.endObject();
+                channel.sendResponse(new BytesRestResponse(RestStatus.OK, builder));
+            }
+        };
+    }
+
     private static Integer parseSlices(RestRequest request) {
         String slicesString = request.param("slices");
         if (slicesString == null) {

rest-api-spec/src/main/resources/rest-api-spec/api/indices.clone.json

@@ -46,14 +46,6 @@
       "wait_for_active_shards": {
         "type" : "string",
         "description" : "Set the number of active shards to wait for on the cloned index before the operation returns."
-      },
-      "wait_for_completion": {
-        "type" : "boolean",
-        "description" : "If false, the request will return a task immediately and the operation will run in background. Defaults to true."
-      },
-      "task_execution_timeout": {
-        "type" : "time",
-        "description" : "Explicit task execution timeout, only useful when wait_for_completion is false, defaults to 1h."
       }
     },
     "body": {

rest-api-spec/src/main/resources/rest-api-spec/api/indices.forcemerge.json

@@ -59,10 +59,6 @@
       "only_expunge_deletes":{
         "type":"boolean",
         "description":"Specify whether the operation should only expunge deleted documents"
-      },
-      "wait_for_completion": {
-        "type" : "boolean",
-        "description" : "If false, the request will return a task immediately and the operation will run in background. Defaults to true."
       }
     }
   }

rest-api-spec/src/main/resources/rest-api-spec/api/indices.open.json

@@ -28,15 +28,7 @@
       },
       "master_timeout":{
         "type":"time",
-        "description":"Specify timeout for connection to master",
-        "deprecated":{
-          "version":"2.0.0",
-          "description":"To promote inclusive language, use 'cluster_manager_timeout' instead."
-        }
-      },
-      "cluster_manager_timeout":{
-        "type":"time",
-        "description":"Specify timeout for connection to cluster-manager node"
+        "description":"Specify timeout for connection to master"
       },
       "ignore_unavailable":{
         "type":"boolean",
@@ -61,14 +53,6 @@
       "wait_for_active_shards":{
         "type":"string",
         "description":"Sets the number of active shards to wait for before the operation returns."
-      },
-      "wait_for_completion": {
-        "type" : "boolean",
-        "description" : "If false, the request will return a task immediately and the operation will run in background. Defaults to true."
-      },
-      "task_execution_timeout": {
-        "type" : "time",
-        "description" : "Explicit task execution timeout, only useful when wait_for_completion is false, defaults to 1h."
       }
     }
   }

rest-api-spec/src/main/resources/rest-api-spec/api/indices.shrink.json

@@ -50,14 +50,6 @@
       "wait_for_active_shards": {
         "type" : "string",
         "description" : "Set the number of active shards to wait for on the shrunken index before the operation returns."
-      },
-      "wait_for_completion": {
-        "type" : "boolean",
-        "description" : "If false, the request will return a task immediately and the operation will run in background. Defaults to true."
-      },
-      "task_execution_timeout": {
-        "type" : "time",
-        "description" : "Explicit task execution timeout, only useful when wait_for_completion is false, defaults to 1h."
       }
     },
     "body":{

rest-api-spec/src/main/resources/rest-api-spec/api/indices.split.json

@@ -50,14 +50,6 @@
       "wait_for_active_shards": {
         "type" : "string",
         "description" : "Set the number of active shards to wait for on the shrunken index before the operation returns."
-      },
-      "wait_for_completion": {
-        "type" : "boolean",
-        "description" : "If false, the request will return a task immediately and the operation will run in background. Defaults to true."
-      },
-      "task_execution_timeout": {
-        "type" : "time",
-        "description" : "Explicit task execution timeout, only useful when wait_for_completion is false, defaults to 1h."
       }
     },
     "body":{