Skip to content

Commit 4215fa5

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: add SPOT to Preemptibility enum (#512)
* feat: add SPOT to Preemptibility enum PiperOrigin-RevId: 503019826 Source-Link: googleapis/googleapis@77cd8f1 Source-Link: googleapis/googleapis-gen@a3b02db Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTNiMDJkYmIzMzljZjhkYWU1ZDYxMTQ1MDI5MmI3ODIwZjEyMDA3NSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * docs: Add documentation for enums fix: Add context manager return types chore: Update gapic-generator-python to v1.8.1 PiperOrigin-RevId: 503210727 Source-Link: googleapis/googleapis@a391fd1 Source-Link: googleapis/googleapis-gen@0080f83 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDA4MGY4MzBkZWMzN2MzMzg0MTU3MDgyYmNlMjc5ZTM3MDc5ZWE1OCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 89972ab commit 4215fa5

13 files changed

Lines changed: 405 additions & 21 deletions

File tree

‎packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/autoscaling_policy_service/client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@ def sample_delete_autoscaling_policy():
10441044
metadata=metadata,
10451045
)
10461046

1047-
def __enter__(self):
1047+
def __enter__(self) -> "AutoscalingPolicyServiceClient":
10481048
return self
10491049

10501050
def __exit__(self, type, value, traceback):

‎packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/batch_controller/client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ def sample_delete_batch():
898898
metadata=metadata,
899899
)
900900

901-
def __enter__(self):
901+
def __enter__(self) -> "BatchControllerClient":
902902
return self
903903

904904
def __exit__(self, type, value, traceback):

‎packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/cluster_controller/client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1654,7 +1654,7 @@ def sample_diagnose_cluster():
16541654
# Done; return the response.
16551655
return response
16561656

1657-
def __enter__(self):
1657+
def __enter__(self) -> "ClusterControllerClient":
16581658
return self
16591659

16601660
def __exit__(self, type, value, traceback):

‎packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/job_controller/client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1314,7 +1314,7 @@ def sample_delete_job():
13141314
metadata=metadata,
13151315
)
13161316

1317-
def __enter__(self):
1317+
def __enter__(self) -> "JobControllerClient":
13181318
return self
13191319

13201320
def __exit__(self, type, value, traceback):

‎packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/node_group_controller/client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ def sample_get_node_group():
835835
# Done; return the response.
836836
return response
837837

838-
def __enter__(self):
838+
def __enter__(self) -> "NodeGroupControllerClient":
839839
return self
840840

841841
def __exit__(self, type, value, traceback):

‎packages/google-cloud-dataproc/google/cloud/dataproc_v1/services/workflow_template_service/client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1452,7 +1452,7 @@ def sample_delete_workflow_template():
14521452
metadata=metadata,
14531453
)
14541454

1455-
def __enter__(self):
1455+
def __enter__(self) -> "WorkflowTemplateServiceClient":
14561456
return self
14571457

14581458
def __exit__(self, type, value, traceback):

‎packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/batches.py‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,25 @@ class Batch(proto.Message):
250250
"""
251251

252252
class State(proto.Enum):
253-
r"""The batch state."""
253+
r"""The batch state.
254+
255+
Values:
256+
STATE_UNSPECIFIED (0):
257+
The batch state is unknown.
258+
PENDING (1):
259+
The batch is created before running.
260+
RUNNING (2):
261+
The batch is running.
262+
CANCELLING (3):
263+
The batch is cancelling.
264+
CANCELLED (4):
265+
The batch cancellation was successful.
266+
SUCCEEDED (5):
267+
The batch completed successfully.
268+
FAILED (6):
269+
The batch is no longer running due to an
270+
error.
271+
"""
254272
STATE_UNSPECIFIED = 0
255273
PENDING = 1
256274
RUNNING = 2

‎packages/google-cloud-dataproc/google/cloud/dataproc_v1/types/clusters.py‎

Lines changed: 143 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,24 @@ class PrivateIpv6GoogleAccess(proto.Enum):
577577
IPv6. These values are directly mapped to corresponding values in
578578
the `Compute Engine Instance
579579
fields <https://cloud.google.com/compute/docs/reference/rest/v1/instances>`__.
580+
581+
Values:
582+
PRIVATE_IPV6_GOOGLE_ACCESS_UNSPECIFIED (0):
583+
If unspecified, Compute Engine default behavior will apply,
584+
which is the same as
585+
[INHERIT_FROM_SUBNETWORK][google.cloud.dataproc.v1.GceClusterConfig.PrivateIpv6GoogleAccess.INHERIT_FROM_SUBNETWORK].
586+
INHERIT_FROM_SUBNETWORK (1):
587+
Private access to and from Google Services
588+
configuration inherited from the subnetwork
589+
configuration. This is the default Compute
590+
Engine behavior.
591+
OUTBOUND (2):
592+
Enables outbound private IPv6 access to
593+
Google Services from the Dataproc cluster.
594+
BIDIRECTIONAL (3):
595+
Enables bidirectional private IPv6 access
596+
between Google Services and the Dataproc
597+
cluster.
580598
"""
581599
PRIVATE_IPV6_GOOGLE_ACCESS_UNSPECIFIED = 0
582600
INHERIT_FROM_SUBNETWORK = 1
@@ -795,10 +813,39 @@ class InstanceGroupConfig(proto.Message):
795813
"""
796814

797815
class Preemptibility(proto.Enum):
798-
r"""Controls the use of preemptible instances within the group."""
816+
r"""Controls the use of preemptible instances within the group.
817+
818+
Values:
819+
PREEMPTIBILITY_UNSPECIFIED (0):
820+
Preemptibility is unspecified, the system
821+
will choose the appropriate setting for each
822+
instance group.
823+
NON_PREEMPTIBLE (1):
824+
Instances are non-preemptible.
825+
This option is allowed for all instance groups
826+
and is the only valid value for Master and
827+
Worker instance groups.
828+
PREEMPTIBLE (2):
829+
Instances are [preemptible]
830+
(https://cloud.google.com/compute/docs/instances/preemptible).
831+
832+
This option is allowed only for [secondary worker]
833+
(https://cloud.google.com/dataproc/docs/concepts/compute/secondary-vms)
834+
groups.
835+
SPOT (3):
836+
Instances are [Spot VMs]
837+
(https://cloud.google.com/compute/docs/instances/spot).
838+
839+
This option is allowed only for [secondary worker]
840+
(https://cloud.google.com/dataproc/docs/concepts/compute/secondary-vms)
841+
groups. Spot VMs are the latest version of [preemptible VMs]
842+
(https://cloud.google.com/compute/docs/instances/preemptible),
843+
and provide additional features.
844+
"""
799845
PREEMPTIBILITY_UNSPECIFIED = 0
800846
NON_PREEMPTIBLE = 1
801847
PREEMPTIBLE = 2
848+
SPOT = 3
802849

803850
num_instances: int = proto.Field(
804851
proto.INT32,
@@ -1007,7 +1054,14 @@ class NodeGroup(proto.Message):
10071054
"""
10081055

10091056
class Role(proto.Enum):
1010-
r"""Node group roles."""
1057+
r"""Node group roles.
1058+
1059+
Values:
1060+
ROLE_UNSPECIFIED (0):
1061+
Required unspecified role.
1062+
DRIVER (1):
1063+
Job drivers run on the node group.
1064+
"""
10111065
ROLE_UNSPECIFIED = 0
10121066
DRIVER = 1
10131067

@@ -1081,7 +1135,45 @@ class ClusterStatus(proto.Message):
10811135
"""
10821136

10831137
class State(proto.Enum):
1084-
r"""The cluster state."""
1138+
r"""The cluster state.
1139+
1140+
Values:
1141+
UNKNOWN (0):
1142+
The cluster state is unknown.
1143+
CREATING (1):
1144+
The cluster is being created and set up. It
1145+
is not ready for use.
1146+
RUNNING (2):
1147+
The cluster is currently running and healthy. It is ready
1148+
for use.
1149+
1150+
**Note:** The cluster state changes from "creating" to
1151+
"running" status after the master node(s), first two primary
1152+
worker nodes (and the last primary worker node if primary
1153+
workers > 2) are running.
1154+
ERROR (3):
1155+
The cluster encountered an error. It is not
1156+
ready for use.
1157+
ERROR_DUE_TO_UPDATE (9):
1158+
The cluster has encountered an error while
1159+
being updated. Jobs can be submitted to the
1160+
cluster, but the cluster cannot be updated.
1161+
DELETING (4):
1162+
The cluster is being deleted. It cannot be
1163+
used.
1164+
UPDATING (5):
1165+
The cluster is being updated. It continues to
1166+
accept and process jobs.
1167+
STOPPING (6):
1168+
The cluster is being stopped. It cannot be
1169+
used.
1170+
STOPPED (7):
1171+
The cluster is currently stopped. It is not
1172+
ready for use.
1173+
STARTING (8):
1174+
The cluster is being started. It is not ready
1175+
for use.
1176+
"""
10851177
UNKNOWN = 0
10861178
CREATING = 1
10871179
RUNNING = 2
@@ -1094,7 +1186,23 @@ class State(proto.Enum):
10941186
STARTING = 8
10951187

10961188
class Substate(proto.Enum):
1097-
r"""The cluster substate."""
1189+
r"""The cluster substate.
1190+
1191+
Values:
1192+
UNSPECIFIED (0):
1193+
The cluster substate is unknown.
1194+
UNHEALTHY (1):
1195+
The cluster is known to be in an unhealthy
1196+
state (for example, critical daemons are not
1197+
running or HDFS capacity is exhausted).
1198+
1199+
Applies to RUNNING state.
1200+
STALE_STATUS (2):
1201+
The agent-reported status is out of date (may
1202+
occur if Dataproc loses communication with
1203+
Agent).
1204+
Applies to RUNNING state.
1205+
"""
10981206
UNSPECIFIED = 0
10991207
UNHEALTHY = 1
11001208
STALE_STATUS = 2
@@ -1445,6 +1553,25 @@ class MetricSource(proto.Enum):
14451553
r"""A source for the collection of Dataproc OSS metrics (see [available
14461554
OSS metrics]
14471555
(https://cloud.google.com//dataproc/docs/guides/monitoring#available_oss_metrics)).
1556+
1557+
Values:
1558+
METRIC_SOURCE_UNSPECIFIED (0):
1559+
Required unspecified metric source.
1560+
MONITORING_AGENT_DEFAULTS (1):
1561+
Default monitoring agent metrics. If this source is enabled,
1562+
Dataproc enables the monitoring agent in Compute Engine, and
1563+
collects default monitoring agent metrics, which are
1564+
published with an ``agent.googleapis.com`` prefix.
1565+
HDFS (2):
1566+
HDFS metric source.
1567+
SPARK (3):
1568+
Spark metric source.
1569+
YARN (4):
1570+
YARN metric source.
1571+
SPARK_HISTORY_SERVER (5):
1572+
Spark History Server metric source.
1573+
HIVESERVER2 (6):
1574+
Hiveserver2 metric source.
14481575
"""
14491576
METRIC_SOURCE_UNSPECIFIED = 0
14501577
MONITORING_AGENT_DEFAULTS = 1
@@ -2077,6 +2204,18 @@ class ReservationAffinity(proto.Message):
20772204
class Type(proto.Enum):
20782205
r"""Indicates whether to consume capacity from an reservation or
20792206
not.
2207+
2208+
Values:
2209+
TYPE_UNSPECIFIED (0):
2210+
2211+
NO_RESERVATION (1):
2212+
Do not consume from any allocated capacity.
2213+
ANY_RESERVATION (2):
2214+
Consume any reservation available.
2215+
SPECIFIC_RESERVATION (3):
2216+
Must consume from a specific reservation.
2217+
Must specify key value fields for specifying the
2218+
reservations.
20802219
"""
20812220
TYPE_UNSPECIFIED = 0
20822221
NO_RESERVATION = 1

0 commit comments

Comments
 (0)