Removed NOT_FOUND for empty results. (#6544)

* Removed NOT_FOUND for empty results. Signed-off-by: Harsh Jain <harshjai@amazon.com> * Fixed failing tests. Signed-off-by: Harsh Jain <harshjai@amazon.com> * Removed unnecessary semi-colon. Signed-off-by: Harsh Jain <harshjai@amazon.com> Signed-off-by: Harsh Jain <harshjai@amazon.com> * Added change log. Signed-off-by: Harsh Jain <harshjai@amazon.com> * Fixed formatting issues Signed-off-by: Harsh Jain <harshjai@amazon.com> * Backported to 2.x branch Signed-off-by: Harsh Jain <harshjai@amazon.com> * Removed duplicate entry as this entry is present under [Unrelease 2.x]. Signed-off-by: Harsh Jain <harshjai@amazon.com> * Updated changelog to make it more meaningful. Signed-off-by: Harsh Jain <harshjai@amazon.com> --------- Signed-off-by: Harsh Jain <harshjai@amazon.com> Co-authored-by: Harsh Jain <harshjai@amazon.com> (cherry picked from commit 67a9b43)
opensearch-project · Mar 10, 2023 · a045b2f · a045b2f
1 parent fb0d7d7
commit a045b2f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [Segment Replication] Allocation and rebalancing based on average primary shard count per index ([#6422](https://github.com/opensearch-project/OpenSearch/pull/6422))
 - The truncation limit of the OpenSearchJsonLayout logger is now configurable ([#6569](https://github.com/opensearch-project/OpenSearch/pull/6569))
 - 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))
 
 ### Dependencies
 - Bump `org.apache.logging.log4j:log4j-core` from 2.18.0 to 2.20.0 ([#6490](https://github.com/opensearch-project/OpenSearch/pull/6490))

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
@@ -138,5 +138,7 @@
   - match: {pits.0.successful: true }
 
   - do:
-      catch: missing
-      delete_all_pits: { }
+      delete_all_pits: {}
+
+  - match: {pits: []}
+  - length: {pits: 0}
diff --git a/server/src/main/java/org/opensearch/action/search/DeletePitResponse.java b/server/src/main/java/org/opensearch/action/search/DeletePitResponse.java
@@ -24,7 +24,6 @@
 import java.util.List;
 
 import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
-import static org.opensearch.rest.RestStatus.NOT_FOUND;
 import static org.opensearch.rest.RestStatus.OK;
 
 /**
@@ -57,7 +56,6 @@ public List<DeletePitInfo> getDeletePitResults() {
      */
     @Override
     public RestStatus status() {
-        if (deletePitResults.isEmpty()) return NOT_FOUND;
         return OK;
     }
 

diff --git a/server/src/test/java/org/opensearch/search/DeletePitResponseTests.java b/server/src/test/java/org/opensearch/search/DeletePitResponseTests.java
@@ -43,7 +43,7 @@ public void testDeletePitResponseToXContent() throws IOException {
     public void testDeletePitResponseToAndFromXContent() throws IOException {
         XContentType xContentType = randomFrom(XContentType.values());
         DeletePitResponse originalResponse = createDeletePitResponseTestItem();
-        ;
+
         BytesReference originalBytes = toShuffledXContent(originalResponse, xContentType, ToXContent.EMPTY_PARAMS, randomBoolean());
         DeletePitResponse parsedResponse;
         try (XContentParser parser = createParser(xContentType.xContent(), originalBytes)) {