Skip to content
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

Bigtable: pick up changes to GAPIC client configuration (via synth). #8724

Merged
merged 1 commit into from
Jul 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,114 +3,132 @@
"google.bigtable.admin.v2.BigtableInstanceAdmin": {
"retry_codes": {
"idempotent": ["DEADLINE_EXCEEDED", "UNAVAILABLE"],
"non_idempotent": ["UNAVAILABLE"],
"non_idempotent": [],
},
"retry_params": {
"default": {
"initial_retry_delay_millis": 5,
"idempotent_params": {
"initial_retry_delay_millis": 1000,
"retry_delay_multiplier": 2.0,
"max_retry_delay_millis": 60000,
"initial_rpc_timeout_millis": 60000,
"rpc_timeout_multiplier": 1.0,
"max_rpc_timeout_millis": 60000,
"total_timeout_millis": 600000,
}
},
"non_idempotent_params": {
"initial_retry_delay_millis": 0,
"retry_delay_multiplier": 1.0,
"max_retry_delay_millis": 0,
"initial_rpc_timeout_millis": 60000,
"rpc_timeout_multiplier": 1.0,
"max_rpc_timeout_millis": 60000,
"total_timeout_millis": 60000,
},
"non_idempotent_heavy_params": {
"initial_retry_delay_millis": 0,
"retry_delay_multiplier": 1.0,
"max_retry_delay_millis": 0,
"initial_rpc_timeout_millis": 300000,
"rpc_timeout_multiplier": 1.0,
"max_rpc_timeout_millis": 300000,
"total_timeout_millis": 300000,
},
},
"methods": {
"CreateInstance": {
"timeout_millis": 60000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_heavy_params",
},
"GetInstance": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"ListInstances": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"UpdateInstance": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"PartialUpdateInstance": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"DeleteInstance": {
"timeout_millis": 60000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_params",
},
"CreateCluster": {
"timeout_millis": 60000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_params",
},
"GetCluster": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"ListClusters": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"UpdateCluster": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"DeleteCluster": {
"timeout_millis": 60000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_params",
},
"CreateAppProfile": {
"timeout_millis": 60000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_params",
},
"GetAppProfile": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"ListAppProfiles": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"UpdateAppProfile": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"DeleteAppProfile": {
"timeout_millis": 60000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_params",
},
"GetIamPolicy": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"SetIamPolicy": {
"timeout_millis": 60000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_params",
},
"TestIamPermissions": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,81 +6,108 @@
"non_idempotent": [],
},
"retry_params": {
"default": {
"initial_retry_delay_millis": 100,
"retry_delay_multiplier": 1.3,
"idempotent_params": {
"initial_retry_delay_millis": 1000,
"retry_delay_multiplier": 2.0,
"max_retry_delay_millis": 60000,
"initial_rpc_timeout_millis": 20000,
"initial_rpc_timeout_millis": 60000,
"rpc_timeout_multiplier": 1.0,
"max_rpc_timeout_millis": 20000,
"max_rpc_timeout_millis": 60000,
"total_timeout_millis": 600000,
}
},
"non_idempotent_params": {
"initial_retry_delay_millis": 0,
"retry_delay_multiplier": 1.0,
"max_retry_delay_millis": 0,
"initial_rpc_timeout_millis": 60000,
"rpc_timeout_multiplier": 1.0,
"max_rpc_timeout_millis": 60000,
"total_timeout_millis": 60000,
},
"non_idempotent_heavy_params": {
"initial_retry_delay_millis": 0,
"retry_delay_multiplier": 1.0,
"max_retry_delay_millis": 0,
"initial_rpc_timeout_millis": 300000,
"rpc_timeout_multiplier": 1.0,
"max_rpc_timeout_millis": 300000,
"total_timeout_millis": 300000,
},
"drop_row_range_params": {
"initial_retry_delay_millis": 0,
"retry_delay_multiplier": 1.0,
"max_retry_delay_millis": 0,
"initial_rpc_timeout_millis": 3600000,
"rpc_timeout_multiplier": 1.0,
"max_rpc_timeout_millis": 3600000,
"total_timeout_millis": 3600000,
},
},
"methods": {
"CreateTable": {
"timeout_millis": 130000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_heavy_params",
},
"CreateTableFromSnapshot": {
"timeout_millis": 60000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_params",
},
"ListTables": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"GetTable": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"DeleteTable": {
"timeout_millis": 60000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_params",
},
"ModifyColumnFamilies": {
"timeout_millis": 60000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_heavy_params",
},
"DropRowRange": {
"timeout_millis": 900000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "drop_row_range_params",
},
"GenerateConsistencyToken": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"CheckConsistency": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"SnapshotTable": {
"timeout_millis": 60000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_params",
},
"GetSnapshot": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"ListSnapshots": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"DeleteSnapshot": {
"timeout_millis": 60000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_params",
},
},
}
Expand Down
54 changes: 36 additions & 18 deletions bigtable/google/cloud/bigtable_v2/gapic/bigtable_client_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,55 +6,73 @@
"non_idempotent": [],
},
"retry_params": {
"default": {
"initial_retry_delay_millis": 100,
"retry_delay_multiplier": 1.3,
"idempotent_params": {
"initial_retry_delay_millis": 10,
"retry_delay_multiplier": 2.0,
"max_retry_delay_millis": 60000,
"initial_rpc_timeout_millis": 20000,
"rpc_timeout_multiplier": 1.0,
"max_rpc_timeout_millis": 20000,
"total_timeout_millis": 600000,
},
"streaming": {
"initial_retry_delay_millis": 100,
"retry_delay_multiplier": 1.3,
"non_idempotent_params": {
"initial_retry_delay_millis": 10,
"retry_delay_multiplier": 2.0,
"max_retry_delay_millis": 60000,
"initial_rpc_timeout_millis": 20000,
"rpc_timeout_multiplier": 1.0,
"max_rpc_timeout_millis": 20000,
"total_timeout_millis": 3600000,
"total_timeout_millis": 20000,
},
"read_rows_params": {
"initial_retry_delay_millis": 10,
"retry_delay_multiplier": 2.0,
"max_retry_delay_millis": 60000,
"initial_rpc_timeout_millis": 300000,
"rpc_timeout_multiplier": 1.0,
"max_rpc_timeout_millis": 300000,
"total_timeout_millis": 43200000,
},
"mutate_rows_params": {
"initial_retry_delay_millis": 10,
"retry_delay_multiplier": 2.0,
"max_retry_delay_millis": 60000,
"initial_rpc_timeout_millis": 60000,
"rpc_timeout_multiplier": 1.0,
"max_rpc_timeout_millis": 60000,
"total_timeout_millis": 600000,
},
},
"methods": {
"ReadRows": {
"timeout_millis": 3600000,
"timeout_millis": 43200000,
"retry_codes_name": "idempotent",
"retry_params_name": "streaming",
"retry_params_name": "read_rows_params",
},
"SampleRowKeys": {
"timeout_millis": 60000,
"timeout_millis": 20000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"MutateRow": {
"timeout_millis": 60000,
"timeout_millis": 20000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "idempotent_params",
},
"MutateRows": {
"timeout_millis": 60000,
"retry_codes_name": "idempotent",
"retry_params_name": "default",
"retry_params_name": "mutate_rows_params",
},
"CheckAndMutateRow": {
"timeout_millis": 60000,
"timeout_millis": 20000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_params",
},
"ReadModifyWriteRow": {
"timeout_millis": 60000,
"timeout_millis": 20000,
"retry_codes_name": "non_idempotent",
"retry_params_name": "default",
"retry_params_name": "non_idempotent_params",
},
},
}
Expand Down
Loading