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

Provide a way to modify spark parameters #2691

Merged
merged 4 commits into from
May 24, 2024

Conversation

ykmr1224
Copy link
Collaborator

@ykmr1224 ykmr1224 commented May 22, 2024

Description

  • Provide a way to modify spark parameters
  • Add RequestContext so that upstream can provide context information to SparkExecutionEngineConfigSupplier.
    • SparkExecutionEngineConfigSupplier can use the context to customize the SparkExecutionEngineConfig.
    • Since we don't use context information so far, NullRequestContext is used.

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.

@ykmr1224 ykmr1224 self-assigned this May 22, 2024
sparkExecutionEngineConfig.setClusterName(clusterName.value());
return sparkExecutionEngineConfig;
builder.clusterName(clusterName.value());
return builder.build();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

builder calls isn't chained like builder.applicationId(...).executionRoleARN(...).build()
does builder also work this way?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(pretty sure I included this in initial review, dunno why this comment is missing)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Fixed!

ykmr1224 added 2 commits May 23, 2024 20:57
Signed-off-by: Tomoyuki Morita <[email protected]>
Signed-off-by: Tomoyuki Morita <[email protected]>
seankao-az
seankao-az previously approved these changes May 24, 2024
rupal-bq
rupal-bq previously approved these changes May 24, 2024
Signed-off-by: Tomoyuki Morita <[email protected]>
@ykmr1224 ykmr1224 dismissed stale reviews from rupal-bq and seankao-az via a657a27 May 24, 2024 16:43
@ykmr1224 ykmr1224 merged commit 5a2c199 into opensearch-project:main May 24, 2024
20 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.x
# Create a new branch
git switch --create backport/backport-2691-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5a2c199b64f1e02975b258e8711f3beb4c5d81ed
# Push it to GitHub
git push --set-upstream origin backport/backport-2691-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2691-to-2.x.

ykmr1224 added a commit to ykmr1224/sql that referenced this pull request May 24, 2024
* Provide a way to modify spark parameters

Signed-off-by: Tomoyuki Morita <[email protected]>

* Address review comment

Signed-off-by: Tomoyuki Morita <[email protected]>

* Address review comment

Signed-off-by: Tomoyuki Morita <[email protected]>

* Address review comment

Signed-off-by: Tomoyuki Morita <[email protected]>

---------

Signed-off-by: Tomoyuki Morita <[email protected]>

(cherry picked from commit 5a2c199)
ykmr1224 added a commit that referenced this pull request May 24, 2024
* Provide a way to modify spark parameters

Signed-off-by: Tomoyuki Morita <[email protected]>

* Address review comment

Signed-off-by: Tomoyuki Morita <[email protected]>

* Address review comment

Signed-off-by: Tomoyuki Morita <[email protected]>

* Address review comment

Signed-off-by: Tomoyuki Morita <[email protected]>

---------

Signed-off-by: Tomoyuki Morita <[email protected]>

(cherry picked from commit 5a2c199)
@ykmr1224 ykmr1224 deleted the dqs/spark-parameter branch June 12, 2024 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport-failed maintenance Improves code quality, but not the product
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants