Skip to content

feat: [google-cloud-dataproc] add the cohort and auto tuning configuration to the batch's RuntimeConfig #12823

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
vchudnov-g merged 5 commits into from
Jun 27, 2024
Merged

feat: [google-cloud-dataproc] add the cohort and auto tuning configuration to the batch's RuntimeConfig #12823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1c838e
feat: add the cohort and auto tuning configuration to the batch's Run…
gcf-owl-bot[bot] Jun 24, 2024
40a2ce1
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jun 24, 2024
e5c00d3
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jun 24, 2024
e7b18e7
Merge branch 'owl-bot-copy-packages-google-cloud-dataproc' of https:/…
gcf-owl-bot[bot] Jun 24, 2024
f7b31e5
Merge branch 'main' into owl-bot-copy-packages-google-cloud-dataproc
vchudnov-g Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/google-cloud-dataproc/google/cloud/dataproc/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@
TerminateSessionRequest,
)
from google.cloud.dataproc_v1.types.shared import (
AutotuningConfig,
Component,
EnvironmentConfig,
ExecutionConfig,
Expand Down Expand Up @@ -360,6 +361,7 @@
"ListSessionsResponse",
"Session",
"TerminateSessionRequest",
"AutotuningConfig",
"EnvironmentConfig",
"ExecutionConfig",
"GkeClusterConfig",
Expand Down
2 changes: 2 additions & 0 deletions packages/google-cloud-dataproc/google/cloud/dataproc_v1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
TerminateSessionRequest,
)
from .types.shared import (
AutotuningConfig,
Component,
EnvironmentConfig,
ExecutionConfig,
Expand Down Expand Up @@ -226,6 +227,7 @@
"AutoscalingConfig",
"AutoscalingPolicy",
"AutoscalingPolicyServiceClient",
"AutotuningConfig",
"AuxiliaryNodeGroup",
"AuxiliaryServicesConfig",
"BasicAutoscalingAlgorithm",
Expand Down
2 changes: 2 additions & 0 deletions packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
TerminateSessionRequest,
)
from .shared import (
AutotuningConfig,
Component,
EnvironmentConfig,
ExecutionConfig,
Expand Down Expand Up @@ -293,6 +294,7 @@
"ListSessionsResponse",
"Session",
"TerminateSessionRequest",
"AutotuningConfig",
"EnvironmentConfig",
"ExecutionConfig",
"GkeClusterConfig",
Expand Down
54 changes: 54 additions & 0 deletions packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"KubernetesSoftwareConfig",
"GkeNodePoolTarget",
"GkeNodePoolConfig",
"AutotuningConfig",
"RepositoryConfig",
"PyPiRepositoryConfig",
},
Expand Down Expand Up @@ -138,6 +139,13 @@ class RuntimeConfig(proto.Message):
repository_config (google.cloud.dataproc_v1.types.RepositoryConfig):
Optional. Dependency repository
configuration.
autotuning_config (google.cloud.dataproc_v1.types.AutotuningConfig):
Optional. Autotuning configuration of the
workload.
cohort (str):
Optional. Cohort identifier. Identifies
families of the workloads having the same shape,
e.g. daily ETL jobs.
"""

version: str = proto.Field(
Expand All @@ -158,6 +166,15 @@ class RuntimeConfig(proto.Message):
number=5,
message="RepositoryConfig",
)
autotuning_config: "AutotuningConfig" = proto.Field(
proto.MESSAGE,
number=6,
message="AutotuningConfig",
)
cohort: str = proto.Field(
proto.STRING,
number=7,
)


class EnvironmentConfig(proto.Message):
Expand Down Expand Up @@ -870,6 +887,43 @@ class GkeNodePoolAutoscalingConfig(proto.Message):
)


class AutotuningConfig(proto.Message):
r"""Autotuning configuration of the workload.

Attributes:
scenarios (MutableSequence[google.cloud.dataproc_v1.types.AutotuningConfig.Scenario]):
Optional. Scenarios for which tunings are
applied.
"""

class Scenario(proto.Enum):
r"""Scenario represents a specific goal that autotuning will
attempt to achieve by modifying workloads.

Values:
SCENARIO_UNSPECIFIED (0):
Default value.
SCALING (2):
Scaling recommendations such as
initialExecutors.
BROADCAST_HASH_JOIN (3):
Adding hints for potential relation
broadcasts.
MEMORY (4):
Memory management for workloads.
"""
SCENARIO_UNSPECIFIED = 0
SCALING = 2
BROADCAST_HASH_JOIN = 3
MEMORY = 4

scenarios: MutableSequence[Scenario] = proto.RepeatedField(
proto.ENUM,
number=2,
enum=Scenario,
)


class RepositoryConfig(proto.Message):
r"""Configuration for dependency repositories

Expand Down
2 changes: 2 additions & 0 deletions packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_batch_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2932,6 +2932,8 @@ def test_create_batch_rest(request_type):
"repository_config": {
"pypi_repository_config": {"pypi_repository": "pypi_repository_value"}
},
"autotuning_config": {"scenarios": [2]},
"cohort": "cohort_value",
},
"environment_config": {
"execution_config": {
Expand Down
2 changes: 2 additions & 0 deletions packages/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3334,6 +3334,8 @@ def test_create_session_rest(request_type):
"repository_config": {
"pypi_repository_config": {"pypi_repository": "pypi_repository_value"}
},
"autotuning_config": {"scenarios": [2]},
"cohort": "cohort_value",
},
"environment_config": {
"execution_config": {
Expand Down
4 changes: 4 additions & 0 deletions ...es/google-cloud-dataproc/tests/unit/gapic/dataproc_v1/test_session_template_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3436,6 +3436,8 @@ def test_create_session_template_rest(request_type):
"repository_config": {
"pypi_repository_config": {"pypi_repository": "pypi_repository_value"}
},
"autotuning_config": {"scenarios": [2]},
"cohort": "cohort_value",
},
"environment_config": {
"execution_config": {
Expand Down Expand Up @@ -3872,6 +3874,8 @@ def test_update_session_template_rest(request_type):
"repository_config": {
"pypi_repository_config": {"pypi_repository": "pypi_repository_value"}
},
"autotuning_config": {"scenarios": [2]},
"cohort": "cohort_value",
},
"environment_config": {
"execution_config": {
Expand Down