Skip to content

Commit ec3dec0

Browse files
committed
remove breaking backward compatible changes
Signed-off-by: Kaushal Kumar <[email protected]>
1 parent 8251a83 commit ec3dec0

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

CHANGELOG.md

-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
113113
- Stop processing search requests when _msearch request is cancelled ([#17005](https://github.com/opensearch-project/OpenSearch/pull/17005))
114114
- Fix GRPC AUX_TRANSPORT_PORT and SETTING_GRPC_PORT settings and remove lingering HTTP terminology ([#17037](https://github.com/opensearch-project/OpenSearch/pull/17037))
115115
- [WLM] Add WLM support for search scroll API ([#16981](https://github.com/opensearch-project/OpenSearch/pull/16981))
116-
- Fix exists queries on nested flat_object fields throws exception ([#16803](https://github.com/opensearch-project/OpenSearch/pull/16803))
117116
- Use OpenSearch version to deserialize remote custom metadata([#16494](https://github.com/opensearch-project/OpenSearch/pull/16494))
118117

119118
### Security

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

+1-11
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@
3939
import org.opensearch.core.action.ActionListener;
4040
import org.opensearch.core.common.io.stream.Writeable;
4141
import org.opensearch.tasks.Task;
42-
import org.opensearch.threadpool.ThreadPool;
4342
import org.opensearch.transport.TransportService;
44-
import org.opensearch.wlm.QueryGroupTask;
4543

4644
/**
4745
* Perform the search scroll
@@ -53,32 +51,24 @@ public class TransportSearchScrollAction extends HandledTransportAction<SearchSc
5351
private final ClusterService clusterService;
5452
private final SearchTransportService searchTransportService;
5553
private final SearchPhaseController searchPhaseController;
56-
private final ThreadPool threadPool;
5754

5855
@Inject
5956
public TransportSearchScrollAction(
6057
TransportService transportService,
6158
ClusterService clusterService,
6259
ActionFilters actionFilters,
6360
SearchTransportService searchTransportService,
64-
SearchPhaseController searchPhaseController,
65-
ThreadPool threadPool
61+
SearchPhaseController searchPhaseController
6662
) {
6763
super(SearchScrollAction.NAME, transportService, actionFilters, (Writeable.Reader<SearchScrollRequest>) SearchScrollRequest::new);
6864
this.clusterService = clusterService;
6965
this.searchTransportService = searchTransportService;
7066
this.searchPhaseController = searchPhaseController;
71-
this.threadPool = threadPool;
7267
}
7368

7469
@Override
7570
protected void doExecute(Task task, SearchScrollRequest request, ActionListener<SearchResponse> listener) {
7671
try {
77-
78-
if (task instanceof QueryGroupTask) {
79-
((QueryGroupTask) task).setQueryGroupId(threadPool.getThreadContext());
80-
}
81-
8272
ParsedScrollId scrollId = TransportSearchHelper.parseScrollId(request.scrollId());
8373
Runnable action;
8474
switch (scrollId.getType()) {

0 commit comments

Comments
 (0)