Skip to content

Commit 6412c08

Browse files
addressing review comment
Signed-off-by: Bharathwaj G <[email protected]>
1 parent 1c714c7 commit 6412c08

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

server/src/main/java/org/opensearch/action/search/GetAllPitNodesResponse.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ public GetAllPitNodesResponse(
5252
);
5353
}
5454

55+
/**
56+
* Copy constructor that explicitly sets the list pit infos
57+
*/
58+
public GetAllPitNodesResponse(List<ListPitInfo> listPitInfos, GetAllPitNodesResponse response) {
59+
super(response.getClusterName(), response.getNodes(), response.failures());
60+
pitInfos.addAll(listPitInfos);
61+
}
62+
5563
@Override
5664
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
5765
builder.startObject();
@@ -77,9 +85,4 @@ public void writeNodesTo(StreamOutput out, List<GetAllPitNodeResponse> nodes) th
7785
public List<ListPitInfo> getPitInfos() {
7886
return Collections.unmodifiableList(new ArrayList<>(pitInfos));
7987
}
80-
81-
public void clearAndSetPitInfos(List<ListPitInfo> listPitInfos) {
82-
pitInfos.clear();
83-
pitInfos.addAll(listPitInfos);
84-
}
8588
}

server/src/main/java/org/opensearch/action/search/TransportDeletePitAction.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ public TransportDeletePitAction(
5757
@Override
5858
protected void doExecute(Task task, DeletePitRequest request, ActionListener<DeletePitResponse> listener) {
5959
List<String> pitIds = request.getPitIds();
60-
if (pitIds.size() == 1 && "_all".equals(pitIds.get(0))) {
60+
// when security plugin intercepts the request, if PITs are not present in the cluster the PIT IDs in request will be empty
61+
// and in this case return empty response
62+
if (pitIds.isEmpty()) {
63+
listener.onResponse(new DeletePitResponse(new ArrayList<>()));
64+
} else if (pitIds.size() == 1 && "_all".equals(pitIds.get(0))) {
6165
deleteAllPits(listener);
6266
} else {
6367
deletePits(listener, request);

0 commit comments

Comments
 (0)