Skip to content

[7.17] Closing an empty PIT should return 200 (#94708) #94908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 30, 2023
Merged

[7.17] Closing an empty PIT should return 200 (#94708) #94908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d998483
Closing an empty PIT should return 200 (#94708)
dnhatn Mar 30, 2023
48c8659
Fix compilation
dnhatn Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/94708.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 94708
summary: Return 200 when closing empty PIT or scroll
area: Search
type: bug
issues: []
11 changes: 11 additions & 0 deletions server/src/internalClusterTest/java/org/elasticsearch/action/search/PointInTimeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.action.admin.indices.stats.CommonStats;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.common.settings.Settings;
Expand All @@ -21,6 +22,7 @@
import org.elasticsearch.index.query.RangeQueryBuilder;
import org.elasticsearch.index.shard.IndexShard;
import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.search.SearchContextMissingException;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchService;
Expand Down Expand Up @@ -277,6 +279,15 @@ public void testIndexNotFound() {
}
}

public void testAllowNoIndex() {
OpenPointInTimeRequest request = new OpenPointInTimeRequest("my_index").indicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN)
.keepAlive(TimeValue.timeValueMinutes(between(1, 10)));
String pit = client().execute(OpenPointInTimeAction.INSTANCE, request).actionGet().getPointInTimeId();
ClosePointInTimeResponse closeResp = client().execute(ClosePointInTimeAction.INSTANCE, new ClosePointInTimeRequest(pit))
.actionGet();
assertThat(closeResp.status(), equalTo(RestStatus.OK));
}

public void testCanMatch() throws Exception {
final Settings.Builder settings = Settings.builder()
.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, randomIntBetween(5, 10))
Expand Down
13 changes: 13 additions & 0 deletions server/src/main/java/org/elasticsearch/action/search/ClosePointInTimeResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@
package org.elasticsearch.action.search;

import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.rest.RestStatus;

import java.io.IOException;

import static org.elasticsearch.rest.RestStatus.NOT_FOUND;
import static org.elasticsearch.rest.RestStatus.OK;

public class ClosePointInTimeResponse extends ClearScrollResponse {
public ClosePointInTimeResponse(boolean succeeded, int numFreed) {
super(succeeded, numFreed);
Expand All @@ -20,4 +24,13 @@ public ClosePointInTimeResponse(boolean succeeded, int numFreed) {
public ClosePointInTimeResponse(StreamInput in) throws IOException {
super(in);
}

@Override
public RestStatus status() {
if (isSucceeded() || getNumFreed() > 0) {
return OK;
} else {
return NOT_FOUND;
}
}
}