Skip to content

Handle unsupported media type properly for streaming requests#15531

Merged
andrross merged 1 commit intoopensearch-project:mainfrom
reta:handle.media.type
Aug 31, 2024
Merged

Handle unsupported media type properly for streaming requests#15531
andrross merged 1 commit intoopensearch-project:mainfrom
reta:handle.media.type

Conversation

@reta
Copy link
Copy Markdown
Contributor

@reta reta commented Aug 30, 2024 •
edited
Loading

Description

Handle unsupported media type properly for streaming requests

Related Issues

Fixes the NPE in RestBulkStreamingAction when content type header (media type) is not specified:

java.lang.NullPointerException: Cannot invoke "org.opensearch.core.xcontent.MediaType.mediaTypeWithoutParameters()" because "mediaType" is null                    
        at org.opensearch.rest.action.document.RestBulkStreamingAction.lambda$prepareRequest$6(RestBulkStreamingAction.java:127) ~[opensearch-3.0.0-SNAPSHOT.jar:3.0.0-SNAPSHOT]                                                                                                                                                                    
        at org.opensearch.rest.action.document.RestBulkStreamingAction.lambda$prepareRequest$7(RestBulkStreamingAction.java:213) ~[opensearch-3.0.0-SNAPSHOT.jar:3.0.0-SNAPSHOT]                                                                                                                                                                    
        at org.opensearch.rest.BaseRestHandler.handleRequest(BaseRestHandler.java:128) ~[opensearch-3.0.0-SNAPSHOT.jar:3.0.0-SNAPSHOT]                                    
        at org.opensearch.rest.RestController.dispatchRequest(RestController.java:383) [opensearch-3.0.0-SNAPSHOT.jar:3.0.0-SNAPSHOT]                              
        at org.opensearch.rest.RestController.tryAllHandlers(RestController.java:474) [opensearch-3.0.0-SNAPSHOT.jar:3.0.0-SNAPSHOT]

How to reproduce:

$ curl -X POST http://localhost:9200/_bulk/stream  -d '
{ "delete": { "_index": "movies", "_id": "tt2229499" } }
'

now returns:

{"error":"Content-Type header [application/x-www-form-urlencoded] is not supported","status":406}

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@reta
Handle unsupported media type properly for streaming requests
d81b1d4 
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@reta reta added the bug Something isn't working label Aug 30, 2024
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Aug 30, 2024

❌ Gradle check result for d81b1d4: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Aug 30, 2024

❌ Gradle check result for d81b1d4: null

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@reta reta added the backport 2.x Backport to 2.x branch label Aug 30, 2024
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Aug 30, 2024

❕ Gradle check result for d81b1d4: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@codecov
Copy link
Copy Markdown

codecov bot commented Aug 30, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 25.00000% with 3 lines in your changes missing coverage. Please review.

Project coverage is 71.90%. Comparing base (1d5082e) to head (d81b1d4).
Report is 5 commits behind head on main.

Files with missing lines Patch % Lines
.../main/java/org/opensearch/rest/RestController.java 25.00% 3 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##               main   #15531      +/-   ##
============================================
- Coverage     72.01%   71.90%   -0.12%     
- Complexity    63603    63605       +2     
============================================
  Files          5247     5247              
  Lines        297186   297189       +3     
  Branches      42939    42940       +1     
============================================
- Hits         214023   213683     -340     
- Misses        65610    66023     +413     
+ Partials      17553    17483      -70

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@reta
Copy link
Copy Markdown
Contributor Author

reta commented Aug 30, 2024

@andrross @dblock minor fix for possible NPE, would appreciate a look, thank you!

@andrross andrross merged commit 03d9a24 into opensearch-project:main Aug 31, 2024
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 31, 2024
@github-actions
Handle unsupported media type properly for streaming requests (#15531)
779fda0 
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit 03d9a24)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Aug 31, 2024
Merged
reta pushed a commit that referenced this pull request Aug 31, 2024
@opensearch-trigger-bot @github-actions
Handle unsupported media type properly for streaming requests (#15531) (
0b681c7 
#15544)

(cherry picked from commit 03d9a24)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
akolarkunnu pushed a commit to akolarkunnu/OpenSearch that referenced this pull request Sep 10, 2024
@reta @akolarkunnu
Handle unsupported media type properly for streaming requests (opense…
a528f0f 
…arch-project#15531)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
This was referenced Sep 11, 2024
Open
Open
@prudhvigodithi prudhvigodithi mentioned this pull request Oct 16, 2024
Open
dk2k pushed a commit to dk2k/OpenSearch that referenced this pull request Oct 16, 2024
@reta @dk2k
Handle unsupported media type properly for streaming requests (opense…
55f772c 
…arch-project#15531)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
dk2k pushed a commit to dk2k/OpenSearch that referenced this pull request Oct 17, 2024
@reta @dk2k
Handle unsupported media type properly for streaming requests (opense…
857b857 
…arch-project#15531)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
dk2k pushed a commit to dk2k/OpenSearch that referenced this pull request Oct 21, 2024
@reta @dk2k
Handle unsupported media type properly for streaming requests (opense…
122d725 
…arch-project#15531)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andrross andrross andrross approved these changes

@anasalkouz anasalkouz Awaiting requested review from anasalkouz

@ashking94 ashking94 Awaiting requested review from ashking94

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE

@dblock dblock Awaiting requested review from dblock

@dbwiddis dbwiddis Awaiting requested review from dbwiddis

@gbbafna gbbafna Awaiting requested review from gbbafna

@jainankitk jainankitk Awaiting requested review from jainankitk

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal

@linuxpi linuxpi Awaiting requested review from linuxpi

@mch2 mch2 Awaiting requested review from mch2

@msfroh msfroh Awaiting requested review from msfroh

@nknize nknize Awaiting requested review from nknize

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159

@sachinpkale sachinpkale Awaiting requested review from sachinpkale

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli

@shwetathareja shwetathareja Awaiting requested review from shwetathareja

@sohami sohami Awaiting requested review from sohami

@VachaShah VachaShah Awaiting requested review from VachaShah

Assignees

No one assigned

Labels

backport 2.x Backport to 2.x branch bug Something isn't working skip-changelog

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@reta @andrross