Chiebot-Mirror
/
googleapis
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: support order_by in ListJobs and ListTasks requests

Browse Source 
---
feat: add support for placement policies

---
feat: per-Runnable labels
PiperOrigin-RevId: 531181280
pull/804/head
Google APIs 2 years ago committed by Copybara-Service
parent d8990aae4c
commit 284507839f
3 changed files with 34 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      google/cloud/batch/v1/batch_v1.yaml
  2. 63
      google/cloud/batch/v1/job.proto
  3. 13
      google/cloud/batch/v1/task.proto

17
google/cloud/batch/v1/batch_v1.yaml
Unescape View File

@ -13,7 +13,7 @@ types:
documentation:
summary: An API to manage the running of batch jobs on Google Cloud Platform.
overview: '(include == google/cloud/batch/doc/overview.md ==)'
overview: '(== google/cloud/batch/doc/overview.md ==)'
rules:
- selector: google.cloud.location.Locations.GetLocation
description: Gets information about a location.
@ -38,6 +38,11 @@ http:
get: '/v1/{name=projects/*/locations/*}'
- selector: google.cloud.location.Locations.ListLocations
get: '/v1/{name=projects/*}/locations'
- selector: google.longrunning.Operations.CancelOperation
post: '/v1/{name=projects/*/locations/*/operations/*}:cancel'
body: '*'
- selector: google.longrunning.Operations.DeleteOperation
delete: '/v1/{name=projects/*/locations/*/operations/*}'
- selector: google.longrunning.Operations.GetOperation
get: '/v1/{name=projects/*/locations/*/operations/*}'
- selector: google.longrunning.Operations.ListOperations
@ -61,3 +66,13 @@ authentication:
oauth:
canonical_scopes: |-
https://www.googleapis.com/auth/cloud-platform
publishing:
organization: CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIED
new_issue_uri: ''
documentation_uri: ''
api_short_name: ''
github_label: ''
doc_tag_prefix: ''
codeowner_github_teams:
library_settings:

63
google/cloud/batch/v1/job.proto
Unescape View File

@ -225,14 +225,12 @@ message JobNotification {
message AllocationPolicy {
message LocationPolicy {
// A list of allowed location names represented by internal URLs.
//
// Each location can be a region or a zone.
// Only one region or multiple zones in one region is supported now.
// For example,
// ["regions/us-central1"] allow VMs in any zones in region us-central1.
// ["zones/us-central1-a", "zones/us-central1-c"] only allow VMs
// in zones us-central1-a and us-central1-c.
//
// All locations end up in different regions would cause errors.
// For example,
// ["regions/us-central1", "zones/us-central1-a", "zones/us-central1-b",
@ -243,29 +241,25 @@ message AllocationPolicy {
// A new persistent disk or a local ssd.
// A VM can only have one local SSD setting but multiple local SSD partitions.
// See https://cloud.google.com/compute/docs/disks#pdspecs and
// https://cloud.google.com/compute/docs/disks#pdspecs.
// https://cloud.google.com/compute/docs/disks#localssds.
message Disk {
// A data source from which a PD will be created.
oneof data_source {
// Name of a public or custom image used as the data source.
// For example, the following are all valid URLs:
//
// * Specify the image by its family name:
// (1) Specify the image by its family name:
// projects/{project}/global/images/family/{image_family}
// * Specify the image version:
// (2) Specify the image version:
// projects/{project}/global/images/{image_version}
//
// You can also use Batch customized image in short names.
// The following image values are supported for a boot disk:
//
// * "batch-debian": use Batch Debian images.
// * "batch-centos": use Batch CentOS images.
// * "batch-cos": use Batch Container-Optimized images.
// "batch-debian": use Batch Debian images.
// "batch-centos": use Batch CentOS images.
// "batch-cos": use Batch Container-Optimized images.
string image = 4;
// Name of a snapshot used as the data source.
// Snapshot is not supported as boot disk now.
string snapshot = 5;
}
@ -276,7 +270,6 @@ message AllocationPolicy {
string type = 1;
// Disk size in GB.
//
// For persistent disk, this field is ignored if `data_source` is `image` or
// `snapshot`.
// For local SSD, size_gb should be a multiple of 375GB,
@ -331,7 +324,7 @@ message AllocationPolicy {
// The minimum CPU platform.
// See
// https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform.
// `https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform`.
// Not yet implemented.
string min_cpu_platform = 3;
@ -341,9 +334,8 @@ message AllocationPolicy {
// The accelerators attached to each VM instance.
repeated Accelerator accelerators = 5;
// Boot disk to be created and attached to each VM by this InstancePolicy.
// Book disk to be created and attached to each VM by this InstancePolicy.
// Boot disk will be deleted when the VM is deleted.
// Batch API now only supports booting from image.
Disk boot_disk = 8;
// Non-boot disks to be attached for each VM created by this InstancePolicy.
@ -374,22 +366,18 @@ message AllocationPolicy {
message NetworkInterface {
// The URL of an existing network resource.
// You can specify the network as a full or partial URL.
//
// For example, the following are all valid URLs:
//
// * https://www.googleapis.com/compute/v1/projects/{project}/global/networks/{network}
// * projects/{project}/global/networks/{network}
// * global/networks/{network}
// https://www.googleapis.com/compute/v1/projects/{project}/global/networks/{network}
// projects/{project}/global/networks/{network}
// global/networks/{network}
string network = 1;
// The URL of an existing subnetwork resource in the network.
// You can specify the subnetwork as a full or partial URL.
//
// For example, the following are all valid URLs:
//
// * https://www.googleapis.com/compute/v1/projects/{project}/regions/{region}/subnetworks/{subnetwork}
// * projects/{project}/regions/{region}/subnetworks/{subnetwork}
// * regions/{region}/subnetworks/{subnetwork}
// https://www.googleapis.com/compute/v1/projects/{project}/regions/{region}/subnetworks/{subnetwork}
// projects/{project}/regions/{region}/subnetworks/{subnetwork}
// regions/{region}/subnetworks/{subnetwork}
string subnetwork = 2;
// Default is false (with an external IP address). Required if
@ -408,23 +396,6 @@ message AllocationPolicy {
repeated NetworkInterface network_interfaces = 1;
}
// PlacementPolicy describes a group placement policy for the VMs controlled
// by this AllocationPolicy.
message PlacementPolicy {
// UNSPECIFIED vs. COLLOCATED (default UNSPECIFIED). Use COLLOCATED when you
// want VMs to be located close to each other for low network latency
// between the VMs. No placement policy will be generated when collocation
// is UNSPECIFIED.
string collocation = 1;
// When specified, causes the job to fail if more than max_distance logical
// switches are required between VMs. Batch uses the most compact possible
// placement of VMs even when max_distance is not specified. An explicit
// max_distance makes that level of compactness a strict requirement.
// Not yet implemented
int64 max_distance = 2;
}
// Compute Engine VM instance provisioning model.
enum ProvisioningModel {
// Unspecified.
@ -466,9 +437,6 @@ message AllocationPolicy {
// The network policy.
NetworkPolicy network = 7;
// The placement policy.
PlacementPolicy placement = 10;
}
// A TaskGroup contains one or multiple Tasks that share the same
@ -489,12 +457,11 @@ message TaskGroup {
TaskSpec task_spec = 3 [(google.api.field_behavior) = REQUIRED];
// Number of Tasks in the TaskGroup.
// Default is 1.
// default is 1
int64 task_count = 4;
// Max number of tasks that can run in parallel.
// Default to min(task_count, 1000).
// Field parallelism must be 1 if the scheduling_policy is IN_ORDER.
int64 parallelism = 5;
// An array of environment variable mappings, which are passed to Tasks with

13
google/cloud/batch/v1/task.proto
Unescape View File

@ -72,7 +72,7 @@ message TaskExecution {
message TaskStatus {
// Task states.
enum State {
// Unknown state.
// unknown state
STATE_UNSPECIFIED = 0;
// The Task is created and waiting for resources.
@ -89,9 +89,6 @@ message TaskStatus {
// The Task has succeeded.
SUCCEEDED = 5;
// The Task has not been executed when the Job finishes.
UNEXECUTED = 6;
}
// Task state
@ -127,9 +124,8 @@ message Runnable {
string options = 8;
// If set to true, external network access to and from container will be
// blocked, containers that are with block_external_network as true can
// still communicate with each other, network cannot be specified in the
// `container.options` field.
// blocked. The container will use the default internal network
// 'goog-internal'.
bool block_external_network = 9;
// Optional username for logging in to a docker registry. If username
@ -212,9 +208,6 @@ message Runnable {
// Timeout for this Runnable.
google.protobuf.Duration timeout = 8;
// Labels for this Runnable.
map<string, string> labels = 9;
}
// Spec of a task

Write Preview
Loading…
Cancel
Save