-
Notifications
You must be signed in to change notification settings - Fork 127
Relax default num_workers=0 for job_clusters #4080
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
acceptance/bundle/resources/jobs/num_workers/databricks.yml.tmpl
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| bundle: | ||
| name: test-bundle | ||
|
|
||
| resources: | ||
| jobs: | ||
| sample_job: | ||
| name: sample_job | ||
|
|
||
| trigger: | ||
| # Run this job every day, exactly one day from the last run; see https://docs.databricks.com/api/workspace/jobs/create#trigger | ||
| periodic: | ||
| interval: 1 | ||
| unit: DAYS | ||
|
|
||
| tasks: | ||
| - task_key: notebook_task | ||
| notebook_task: | ||
| notebook_path: sample_notebook.py | ||
| source: WORKSPACE # Without this, there is a different request between direct and terraform | ||
|
|
||
| job_clusters: | ||
| - job_cluster_key: job_cluster_autoscale | ||
| new_cluster: | ||
| spark_version: 16.4.x-scala2.12 | ||
| node_type_id: $NODE_TYPE_ID | ||
| data_security_mode: SINGLE_USER | ||
| autoscale: | ||
| min_workers: 1 | ||
| max_workers: 4 | ||
|
|
||
| # This config results in different request between terraform and direct: | ||
| # Terraform removes "num_workers: 0" and direct sends it as is. | ||
| # This is acceptable difference, users will get appropriate error message backend and can correct their config. | ||
| # | ||
| #- job_cluster_key: job_cluster_autoscale_num_workers0 | ||
| # new_cluster: | ||
| # spark_version: 16.4.x-scala2.13 | ||
| # node_type_id: $NODE_TYPE_ID | ||
| # data_security_mode: SINGLE_USER | ||
| # autoscale: | ||
| # min_workers: 1 | ||
| # max_workers: 4 | ||
| # num_workers: 0 | ||
|
|
||
| - job_cluster_key: job_cluster_autoscale_num_workers1 | ||
| new_cluster: | ||
| spark_version: 16.4.x-scala2.14 | ||
| node_type_id: $NODE_TYPE_ID | ||
| data_security_mode: SINGLE_USER | ||
| autoscale: | ||
| min_workers: 1 | ||
| max_workers: 4 | ||
| num_workers: 1 | ||
|
|
||
| - job_cluster_key: job_cluster_num_workers1 | ||
| new_cluster: | ||
| spark_version: 16.4.x-scala2.15 | ||
| node_type_id: $NODE_TYPE_ID | ||
| data_security_mode: SINGLE_USER | ||
| num_workers: 1 | ||
|
|
||
| - job_cluster_key: job_cluster_num_workers0 | ||
| new_cluster: | ||
| spark_version: 16.4.x-scala2.16 | ||
| node_type_id: $NODE_TYPE_ID | ||
| data_security_mode: SINGLE_USER | ||
| num_workers: 0 | ||
|
|
||
| - job_cluster_key: job_cluster_default | ||
| new_cluster: | ||
| spark_version: 16.4.x-scala2.17 |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
128 changes: 128 additions & 0 deletions
128
acceptance/bundle/resources/jobs/num_workers/output.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
|
|
||
| >>> [CLI] bundle deploy | ||
| Warning: Single node cluster is not correctly configured | ||
| at resources.jobs.sample_job.job_clusters[3].new_cluster | ||
| in databricks.yml:64:13 | ||
|
|
||
| num_workers should be 0 only for single-node clusters. To create a | ||
| valid single node cluster please ensure that the following properties | ||
| are correctly set in the cluster specification: | ||
|
|
||
| spark_conf: | ||
| spark.databricks.cluster.profile: singleNode | ||
| spark.master: local[*] | ||
|
|
||
| custom_tags: | ||
| ResourceClass: SingleNode | ||
|
|
||
|
|
||
| Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... | ||
| Deploying resources... | ||
| Updating deployment state... | ||
| Deployment complete! | ||
|
|
||
| >>> print_requests.py //jobs | ||
| { | ||
| "method": "POST", | ||
| "path": "/api/2.2/jobs/create", | ||
| "body": { | ||
| "deployment": { | ||
| "kind": "BUNDLE", | ||
| "metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json" | ||
| }, | ||
| "edit_mode": "UI_LOCKED", | ||
| "format": "MULTI_TASK", | ||
| "job_clusters": [ | ||
| { | ||
| "job_cluster_key": "job_cluster_autoscale", | ||
| "new_cluster": { | ||
| "autoscale": { | ||
| "max_workers": 4, | ||
| "min_workers": 1 | ||
| }, | ||
| "data_security_mode": "SINGLE_USER", | ||
| "node_type_id": "[NODE_TYPE_ID]", | ||
| "spark_version": "16.4.x-scala2.12" | ||
| } | ||
| }, | ||
| { | ||
| "job_cluster_key": "job_cluster_autoscale_num_workers1", | ||
| "new_cluster": { | ||
| "autoscale": { | ||
| "max_workers": 4, | ||
| "min_workers": 1 | ||
| }, | ||
| "data_security_mode": "SINGLE_USER", | ||
| "node_type_id": "[NODE_TYPE_ID]", | ||
| "num_workers": 1, | ||
| "spark_version": "16.4.x-scala2.14" | ||
| } | ||
| }, | ||
| { | ||
| "job_cluster_key": "job_cluster_num_workers1", | ||
| "new_cluster": { | ||
| "data_security_mode": "SINGLE_USER", | ||
| "node_type_id": "[NODE_TYPE_ID]", | ||
| "num_workers": 1, | ||
| "spark_version": "16.4.x-scala2.15" | ||
| } | ||
| }, | ||
| { | ||
| "job_cluster_key": "job_cluster_num_workers0", | ||
| "new_cluster": { | ||
| "data_security_mode": "SINGLE_USER", | ||
| "node_type_id": "[NODE_TYPE_ID]", | ||
| "num_workers": 0, | ||
| "spark_version": "16.4.x-scala2.16" | ||
| } | ||
| }, | ||
| { | ||
| "job_cluster_key": "job_cluster_default", | ||
| "new_cluster": { | ||
| "num_workers": 0, | ||
| "spark_version": "16.4.x-scala2.17" | ||
| } | ||
| } | ||
| ], | ||
| "max_concurrent_runs": 1, | ||
| "name": "sample_job", | ||
| "queue": { | ||
| "enabled": true | ||
| }, | ||
| "tasks": [ | ||
| { | ||
| "notebook_task": { | ||
| "notebook_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/sample_notebook", | ||
| "source": "WORKSPACE" | ||
| }, | ||
| "task_key": "notebook_task" | ||
| } | ||
| ], | ||
| "trigger": { | ||
| "pause_status": "UNPAUSED", | ||
| "periodic": { | ||
| "interval": 1, | ||
| "unit": "DAYS" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| >>> [CLI] bundle plan | ||
| Warning: Single node cluster is not correctly configured | ||
| at resources.jobs.sample_job.job_clusters[3].new_cluster | ||
| in databricks.yml:64:13 | ||
|
|
||
| num_workers should be 0 only for single-node clusters. To create a | ||
| valid single node cluster please ensure that the following properties | ||
| are correctly set in the cluster specification: | ||
|
|
||
| spark_conf: | ||
| spark.databricks.cluster.profile: singleNode | ||
| spark.master: local[*] | ||
|
|
||
| custom_tags: | ||
| ResourceClass: SingleNode | ||
|
|
||
|
|
||
| Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged |
1 change: 1 addition & 0 deletions
1
acceptance/bundle/resources/jobs/num_workers/sample_notebook.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| # Databricks notebook source |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| envsubst < databricks.yml.tmpl > databricks.yml | ||
| trace $CLI bundle deploy | ||
| trace print_requests.py //jobs | ||
|
|
||
| trace $CLI bundle plan | ||
| rm out.requests.txt |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@denik Should
newbenullhere?Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, absence is expected.
It's untyped nil internally which is correctly rendered as omitted with omitempty.