Skip to content
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.

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

Add conf for spark structured streaming job #2193

Merged

Conversation

penghuo
Copy link
Collaborator

@penghuo penghuo commented Oct 3, 2023

Description

  1. Add Spark conf, --conf spark.flint.job.type=streaming. In Spark Application, if spark.flint.job.type is streaming, call spark.streams.awaitAnyTermination() to avoid EMR-S job exit.
  2. Add EMR-S timeout conf. (1) default timeout is 120mins, (2) if streaming job, timeout is 0.
  3. Remove S3GlueSparkSubmitParameters, Move logic to SparkSubmitParameters

Issues Resolved

n/a

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

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.

@codecov
Copy link

codecov bot commented Oct 3, 2023

Codecov Report

Merging #2193 (7c1c100) into main (79cac7d) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##               main    #2193   +/-   ##
=========================================
  Coverage     96.57%   96.57%           
+ Complexity     4717     4712    -5     
=========================================
  Files           436      437    +1     
  Lines         12544    12552    +8     
  Branches        857      859    +2     
=========================================
+ Hits          12114    12122    +8     
  Misses          422      422           
  Partials          8        8           
Flag Coverage Δ
sql-engine 96.57% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
.../spark/asyncquery/model/SparkSubmitParameters.java 100.00% <100.00%> (ø)
...h/sql/spark/client/EmrServerlessClientImplEMR.java 100.00% <100.00%> (ø)
...g/opensearch/sql/spark/client/StartJobRequest.java 100.00% <100.00%> (ø)
...rch/sql/spark/dispatcher/SparkQueryDispatcher.java 100.00% <100.00%> (ø)

seankao-az
seankao-az previously approved these changes Oct 3, 2023
dai-chen
dai-chen previously approved these changes Oct 3, 2023
Signed-off-by: Peng Huo <[email protected]>
Signed-off-by: Peng Huo <[email protected]>
@penghuo penghuo dismissed stale reviews from dai-chen and seankao-az via e8d32de October 3, 2023 23:54
Signed-off-by: Peng Huo <[email protected]>
Signed-off-by: Peng Huo <[email protected]>
Signed-off-by: Peng Huo <[email protected]>
@vmmusings vmmusings merged commit 89b011b into opensearch-project:main Oct 4, 2023
21 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 4, 2023
* Add conf for spark structured streaming job

Signed-off-by: Peng Huo <[email protected]>

* update

Signed-off-by: Peng Huo <[email protected]>

* fix format

Signed-off-by: Peng Huo <[email protected]>

* fix format

Signed-off-by: Peng Huo <[email protected]>

* remove unused code

Signed-off-by: Peng Huo <[email protected]>

* fix format

Signed-off-by: Peng Huo <[email protected]>

---------

Signed-off-by: Peng Huo <[email protected]>
(cherry picked from commit 89b011b)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
vmmusings pushed a commit that referenced this pull request Oct 4, 2023
* Add conf for spark structured streaming job



* update



* fix format



* fix format



* remove unused code



* fix format



---------


(cherry picked from commit 89b011b)

Signed-off-by: Peng Huo <[email protected]>
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Flint v2.11.0 Issues targeting release v2.11.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants