Skip to content

Exempt internal request markers from streams request param restrictions #139386

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
lukewhiting merged 3 commits into from
Dec 15, 2025
Merged

Exempt internal request markers from streams request param restrictions #139386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f70f76
Exempt internal request markers from streams request param restrictions
lukewhiting Dec 11, 2025
6bf86b8
Merge branch 'main' of github.com:elastic/elasticsearch into 139367-a…
lukewhiting Dec 15, 2025
f7bb7b7
Update docs/changelog/139386.yaml
lukewhiting Dec 15, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/changelog/139386.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 139386
summary: Exempt internal request markers from streams request param restrictions
area: Data streams
type: bug
issues:
- 139367
6 changes: 5 additions & 1 deletion server/src/main/java/org/elasticsearch/action/bulk/TransportAbstractBulkAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,16 @@
import java.util.concurrent.TimeUnit;
import java.util.function.LongSupplier;

import static org.elasticsearch.rest.RestRequest.INTERNAL_MARKER_REQUEST_PARAMETERS;

/**
* This is an abstract base class for bulk actions. It traverses all indices that the request gets routed to, executes all applicable
* pipelines, and then delegates to the concrete implementation of #doInternalExecute to actually index the data.
*/
public abstract class TransportAbstractBulkAction extends HandledTransportAction<BulkRequest, BulkResponse> {
private static final Logger logger = LogManager.getLogger(TransportAbstractBulkAction.class);

public static final Set<String> STREAMS_ALLOWED_PARAMS = new HashSet<>(9) {
public static final Set<String> STREAMS_ALLOWED_PARAMS = new HashSet<>() {
{
add("error_trace");
add("filter_path");
Expand All @@ -76,6 +78,8 @@ public abstract class TransportAbstractBulkAction extends HandledTransportAction
add("refresh");
add("require_data_stream");
add("timeout");
// Add internal marker params
addAll(INTERNAL_MARKER_REQUEST_PARAMETERS);
}
};

Expand Down