fix: inconsistent json and yaml spanner configs

This tries to resolve inconsistent timeout/retries in different client
libraries.

Two major changes:
- Update *_grpc_service_config.json and *_gapic.yaml to make sure that they
  are consistent.
- Add missing ListDatabases config in spanner_admin_database_gapic.yaml.

PiperOrigin-RevId: 312582296
pull/605/head
Google APIs 5 years ago committed by Copybara-Service
parent a175708acd
commit d8a17933f6
  1. 16
      google/spanner/admin/database/v1/spanner_admin_database_gapic.legacy.yaml
  2. 18
      google/spanner/admin/database/v1/spanner_admin_database_gapic.yaml
  3. 14
      google/spanner/admin/instance/v1/spanner_admin_instance_gapic.legacy.yaml
  4. 14
      google/spanner/admin/instance/v1/spanner_admin_instance_gapic.yaml

@ -67,7 +67,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
parent: instance
timeout_millis: 30000
timeout_millis: 3600000
- name: CreateDatabase
flattening:
groups:
@ -102,7 +102,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
name: database
timeout_millis: 30000
timeout_millis: 3600000
- name: UpdateDatabaseDdl
flattening:
groups:
@ -150,7 +150,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
database: database
timeout_millis: 30000
timeout_millis: 3600000
- name: SetIamPolicy
flattening:
groups:
@ -225,7 +225,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
name: backup
timeout_millis: 600000
timeout_millis: 3600000
- name: UpdateBackup
flattening:
groups:
@ -239,7 +239,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
backup.name: backup
timeout_millis: 600000
timeout_millis: 3600000
- name: DeleteBackup
flattening:
groups:
@ -272,7 +272,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
parent: instance
timeout_millis: 600000
timeout_millis: 3600000
- name: RestoreDatabase
flattening:
groups:
@ -314,7 +314,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
parent: instance
timeout_millis: 600000
timeout_millis: 3600000
- name: ListBackupOperations
flattening:
groups:
@ -335,7 +335,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
parent: instance
timeout_millis: 600000
timeout_millis: 3600000
resource_name_generation:
- message_name: ListDatabasesRequest
field_entity_map:

@ -35,6 +35,10 @@ interfaces:
max_rpc_timeout_millis: 60000
total_timeout_millis: 600000
methods:
- name: ListDatabases
retry_codes_name: idempotent
retry_params_name: default
timeout_millis: 3600000
- name: CreateDatabase
long_running:
initial_poll_delay_millis: 20000
@ -43,7 +47,7 @@ interfaces:
total_poll_timeout_millis: 86400000
timeout_millis: 3600000
- name: GetDatabase
timeout_millis: 30000
timeout_millis: 3600000
- name: UpdateDatabaseDdl
retry_codes_name: idempotent
retry_params_name: default
@ -58,7 +62,7 @@ interfaces:
retry_params_name: default
timeout_millis: 3600000
- name: GetDatabaseDdl
timeout_millis: 30000
timeout_millis: 3600000
- name: SetIamPolicy
timeout_millis: 30000
- name: GetIamPolicy
@ -79,11 +83,11 @@ interfaces:
- name: GetBackup
retry_codes_name: idempotent
retry_params_name: default
timeout_millis: 600000
timeout_millis: 3600000
- name: UpdateBackup
retry_codes_name: non_idempotent
retry_params_name: default
timeout_millis: 600000
timeout_millis: 3600000
- name: DeleteBackup
retry_codes_name: idempotent
retry_params_name: default
@ -91,7 +95,7 @@ interfaces:
- name: ListBackups
retry_codes_name: idempotent
retry_params_name: default
timeout_millis: 600000
timeout_millis: 3600000
- name: RestoreDatabase
retry_codes_name: non_idempotent
retry_params_name: default
@ -104,8 +108,8 @@ interfaces:
- name: ListDatabaseOperations
retry_codes_name: idempotent
retry_params_name: default
timeout_millis: 600000
timeout_millis: 3600000
- name: ListBackupOperations
retry_codes_name: idempotent
retry_params_name: default
timeout_millis: 600000
timeout_millis: 3600000

@ -67,7 +67,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
parent: project
timeout_millis: 30000
timeout_millis: 3600000
- name: GetInstanceConfig
flattening:
groups:
@ -80,7 +80,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
name: instance_config
timeout_millis: 30000
timeout_millis: 3600000
- name: ListInstances
flattening:
groups:
@ -100,7 +100,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
parent: project
timeout_millis: 30000
timeout_millis: 3600000
- name: GetInstance
flattening:
groups:
@ -113,7 +113,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
name: instance
timeout_millis: 30000
timeout_millis: 3600000
- name: CreateInstance
flattening:
groups:
@ -130,7 +130,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
parent: project
timeout_millis: 30000
timeout_millis: 3600000
long_running:
return_type: google.spanner.admin.instance.v1.Instance
metadata_type: google.spanner.admin.instance.v1.CreateInstanceMetadata
@ -152,7 +152,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
instance.name: instance
timeout_millis: 30000
timeout_millis: 3600000
long_running:
return_type: google.spanner.admin.instance.v1.Instance
metadata_type: google.spanner.admin.instance.v1.UpdateInstanceMetadata
@ -172,7 +172,7 @@ interfaces:
retry_params_name: default
field_name_patterns:
name: instance
timeout_millis: 30000
timeout_millis: 3600000
- name: SetIamPolicy
flattening:
groups:

@ -36,31 +36,31 @@ interfaces:
total_timeout_millis: 600000
methods:
- name: ListInstanceConfigs
timeout_millis: 30000
timeout_millis: 3600000
- name: GetInstanceConfig
timeout_millis: 30000
timeout_millis: 3600000
- name: ListInstances
timeout_millis: 30000
timeout_millis: 3600000
- name: GetInstance
timeout_millis: 30000
timeout_millis: 3600000
- name: CreateInstance
long_running:
initial_poll_delay_millis: 20000
poll_delay_multiplier: 1.5
max_poll_delay_millis: 45000
total_poll_timeout_millis: 86400000
timeout_millis: 30000
timeout_millis: 3600000
- name: UpdateInstance
long_running:
initial_poll_delay_millis: 20000
poll_delay_multiplier: 1.5
max_poll_delay_millis: 45000
total_poll_timeout_millis: 86400000
timeout_millis: 30000
timeout_millis: 3600000
- name: DeleteInstance
retry_codes_name: idempotent
retry_params_name: default
timeout_millis: 30000
timeout_millis: 3600000
- name: SetIamPolicy
timeout_millis: 30000
- name: GetIamPolicy

Loading…
Cancel
Save