diff --git a/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client_config.py b/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client_config.py index 355020d508b3..b2ec35e0146e 100644 --- a/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client_config.py +++ b/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client_config.py @@ -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", }, }, } diff --git a/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_table_admin_client_config.py b/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_table_admin_client_config.py index 4318e93365cb..1a3f59a06023 100644 --- a/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_table_admin_client_config.py +++ b/bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_table_admin_client_config.py @@ -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", }, }, } diff --git a/bigtable/google/cloud/bigtable_v2/gapic/bigtable_client_config.py b/bigtable/google/cloud/bigtable_v2/gapic/bigtable_client_config.py index 04a7a2572e6b..3096f33e0c68 100644 --- a/bigtable/google/cloud/bigtable_v2/gapic/bigtable_client_config.py +++ b/bigtable/google/cloud/bigtable_v2/gapic/bigtable_client_config.py @@ -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", }, }, } diff --git a/bigtable/synth.metadata b/bigtable/synth.metadata index d4e7bd8af5aa..a53a33c7f0af 100644 --- a/bigtable/synth.metadata +++ b/bigtable/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-07-12T12:14:23.307924Z", + "updateTime": "2019-07-20T12:14:26.395003Z", "sources": [ { "generator": { "name": "artman", - "version": "0.29.4", - "dockerImage": "googleapis/artman@sha256:63f21e83cb92680b7001dc381069e962c9e6dee314fd8365ac554c07c89221fb" + "version": "0.30.1", + "dockerImage": "googleapis/artman@sha256:f1a2e851e5e012c59e1da4125480bb19878f86a4e7fac4f375f2e819956b5aa3" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "47bd0c2ba33c28dd624a65dad382e02bb61d1618", - "internalRef": "257690259" + "sha": "184ab77f4cee62332f8f9a689c70c9bea441f836", + "internalRef": "259048326" } }, {