8000 Pick up changes to GAPIC client configuration (via synth). (#8724) · googleapis/google-cloud-python@cc06277 · GitHub
[go: up one dir, main page]
Skip to content

Commit cc06277

Browse files
yoshi-automationtseaver
yoshi-automation
authored and
tseaver
committed
Pick up changes to GAPIC client configuration (via synth). (#8724)
1 parent 147a44d commit cc06277

File tree

4 files changed

+128
-65
lines changed

4 files changed

+128
-65
lines changed

‎packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_instance_admin_client_config.py‎

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,114 +3,132 @@
33
"google.bigtable.admin.v2.BigtableInstanceAdmin": {
44
"retry_codes": {
55
"idempotent": ["DEADLINE_EXCEEDED", "UNAVAILABLE"],
6-
"non_idempotent": ["UNAVAILABLE"],
6+
"non_idempotent": [],
77
},
88
"retry_params": {
9-
"default": {
10-
"initial_retry_delay_millis": 5,
9+
"idempotent_params": {
10+
"initial_retry_delay_millis": 1000,
1111
"retry_delay_multiplier": 2.0,
1212
"max_retry_delay_millis": 60000,
1313
"initial_rpc_timeout_millis": 60000,
1414
"rpc_timeout_multiplier": 1.0,
1515
"max_rpc_timeout_millis": 60000,
1616
"total_timeout_millis": 600000,
17-
}
17+
},
18+
"non_idempotent_params": {
19+
"initial_retry_delay_millis": 0,
20+
"retry_delay_multiplier": 1.0,
21+
"max_retry_delay_millis": 0,
22+
"initial_rpc_timeout_millis": 60000,
23+
"rpc_timeout_multiplier": 1.0,
24+
"max_rpc_timeout_millis": 60000,
25+
"total_timeout_millis": 60000,
26+
},
27+
"non_idempotent_heavy_params": {
28+
"initial_retry_delay_millis": 0,
29+
"retry_delay_multiplier": 1.0,
30+
"max_retry_delay_millis": 0,
31+
"initial_rpc_timeout_millis": 300000,
32+
"rpc_timeout_multiplier": 1.0,
33+
"max_rpc_timeout_millis": 300000,
34+
"total_timeout_millis": 300000,
35+
},
1836
},
1937
"methods": {
2038
"CreateInstance": {
2139
"timeout_millis": 60000,
2240
"retry_codes_name": "non_idempotent",
23-
"retry_params_name": "default",
41+
"retry_params_name": "non_idempotent_heavy_params",
2442
},
2543
"GetInstance": {
2644
"timeout_millis": 60000, 6D40
2745
"retry_codes_name": "idempotent",
28-
"retry_params_name": "default",
46+
"retry_params_name": "idempotent_params",
2947
},
3048
"ListInstances": {
3149
"timeout_millis": 60000,
3250
"retry_codes_name": "idempotent",
33-
"retry_params_name": "default",
51+
"retry_params_name": "idempotent_params",
3452
},
3553
"UpdateInstance": {
3654
"timeout_millis": 60000,
3755
"retry_codes_name": "idempotent",
38-
"retry_params_name": "default",
56+
"retry_params_name": "idempotent_params",
3957
},
4058
"PartialUpdateInstance": {
4159
"timeout_millis": 60000,
4260
"retry_codes_name": "idempotent",
43-
"retry_params_name": "default",
61+
"retry_params_name": "idempotent_params",
4462
},
4563
"DeleteInstance": {
4664
"timeout_millis": 60000,
4765
"retry_codes_name": "non_idempotent",
48-
"retry_params_name": "default",
66+
"retry_params_name": "non_idempotent_params",
4967
},
5068
"CreateCluster": {
5169
"timeout_millis": 60000,
5270
"retry_codes_name": "non_idempotent",
53-
"retry_params_name": "default",
71+
"retry_params_name": "non_idempotent_params",
5472
},
5573
"GetCluster": {
5674
"timeout_millis": 60000,
5775
"retry_codes_name": "idempotent",
58-
"retry_params_name": "default",
76+
"retry_params_name": "idempotent_params",
5977
},
6078
"ListClusters": {
6179
"timeout_millis": 60000,
6280
"retry_codes_name": "idempotent",
63-
"retry_params_name": "default",
81+
"retry_params_name": "idempotent_params",
6482
},
6583
"UpdateCluster": {
6684
"timeout_millis": 60000,
6785
"retry_codes_name": "idempotent",
68-
"retry_params_name": "default",
86+
"retry_params_name": "idempotent_params",
6987
},
7088
"DeleteCluster": {
7189
"timeout_millis": 60000,
7290
"retry_codes_name": "non_idempotent",
73-
"retry_params_name": "default",
91+
"retry_params_name": "non_idempotent_params",
7492
},
7593
"CreateAppProfile": {
7694
"timeout_millis": 60000,
7795
"retry_codes_name": "non_idempotent",
78-
"retry_params_name": "default",
96+
"retry_params_name": "non_idempotent_params",
7997
},
8098
"GetAppProfile": {
8199
"timeout_millis": 60000,
82100
"retry_codes_name": "idempotent",
83-
"retry_params_name": "default",
101+
"retry_params_name": "idempotent_params",
84102
},
85103
"ListAppProfiles": {
86104
"timeout_millis": 60000,
87105
"retry_codes_name": "idempotent",
88-
"retry_params_name": "default",
106+
"retry_params_name": "idempotent_params",
89107
},
90108
"UpdateAppProfile": {
91109
"timeout_millis": 60000,
92110
"retry_codes_name": "idempotent",
93-
"retry_params_name": "default",
111+
"retry_params_name": "idempotent_params",
94112
},
95113
"DeleteAppProfile": {
96114
"timeout_millis": 60000,
97115
"retry_codes_name": "non_idempotent",
98-
"retry_params_name": "default",
116+
"retry_params_name": "non_idempotent_params",
99117
},
100118
"GetIamPolicy": {
101119
"timeout_millis": 60000,
102120
"retry_codes_name": "idempotent",
103-
"retry_params_name": "default",
121+
"retry_params_name": "idempotent_params",
104122
},
105123
"SetIamPolicy": {
106124
"timeout_millis": 60000,
107125
"retry_codes_name": "non_idempotent",
108-
"retry_params_name": "default",
126+
"retry_params_name": "non_idempotent_params",
109127
},
110128
"TestIamPermissions": {
111129
"timeout_millis": 60000,
112130
"retry_codes_name": "idempotent",
113-
"retry_params_name": "default",
131+
"retry_params_name": "idempotent_params",
114132
},
115133
},
116134
}

‎packages/google-cloud-bigtable/google/cloud/bigtable_admin_v2/gapic/bigtable_table_admin_client_config.py‎

Lines changed: 46 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,81 +6,108 @@
66
"non_idempotent": [],
77
},
88
"retry_params": {
9-
"default": {
10-
"initial_retry_delay_millis": 100,
11-
"retry_delay_multiplier": 1.3,
9+
"idempotent_params": {
10+
"initial_retry_delay_millis": 1000,
11+
"retry_delay_multiplier": 2.0,
1212
"max_retry_delay_millis": 60000,
13-
"initial_rpc_timeout_millis": 20000,
13+
"initial_rpc_timeout_millis": 60000,
1414
"rpc_timeout_multiplier": 1.0,
15-
"max_rpc_timeout_millis": 20000,
15+
"max_rpc_timeout_millis": 60000,
1616
"total_timeout_millis": 600000,
17-
}
17+
},
18+
"non_idempotent_params": {
19+
"initial_retry_delay_millis": 0,
20+
"retry_delay_multiplier": 1.0,
21+
"max_retry_delay_millis": 0,
22+
"initial_rpc_timeout_millis": 60000,
23+
"rpc_timeout_multiplier": 1.0,
24+
"max_rpc_timeout_millis": 60000,
25+
"total_timeout_millis": 60000,
26+
},
27+
"non_idempotent_heavy_params": {
28+
"initial_retry_delay_millis": 0,
29+
"retry_delay_multiplier": 1.0,
30+
"max_retry_delay_millis": 0,
31+
"initial_rpc_timeout_millis": 300000,
32+
"rpc_timeout_multiplier": 1.0,
33+
"max_rpc_timeout_millis": 300000,
34+
"total_timeout_millis": 300000,
35+
},
36+
"drop_row_range_params": {
37+
"initial_retry_delay_millis": 0,
38+
"retry_delay_multiplier": 1.0,
39+
"max_retry_delay_millis": 0,
40+
"initial_rpc_timeout_millis": 3600000,
41+
"rpc_timeout_multiplier": 1.0,
42+
"max_rpc_timeout_millis": 3600000,
43+
"total_timeout_millis": 3600000,
44+
},
1845
},
1946
"methods": {
2047
"CreateTable": {
2148
"timeout_millis": 130000,
2249
"retry_codes_name": "non_idempotent",
23-
"retry_params_name": "default",
50+
"retry_params_name": "non_idempotent_heavy_params",
2451
},
2552
"CreateTableFromSnapshot": {
2653
"timeout_millis": 60000,
2754
"retry_codes_name": "non_idempotent",
28-
"retry_params_name": "default",
55+
"retry_params_name": "non_idempotent_params",
2956
},
3057
"ListTables": {
3158
"timeout_millis": 60000,
3259
"retry_codes_name": "idempotent",
33-
"retry_params_name": "default",
60+
"retry_params_name": "idempotent_params",
3461
},
3562
"GetTable": {
3663
"timeout_millis": 60000,
3764
"retry_codes_name": "idempotent",
38-
"retry_params_name": "default",
65+
"retry_params_name": "idempotent_params",
3966
},
4067
"DeleteTable": {
4168
"timeout_millis": 60000,
4269
"retry_codes_name": "non_idempotent",
43-
"retry_params_name": "default",
70+
"retry_params_name": "non_idempotent_params",
4471
},
4572
"ModifyColumnFamilies": {
4673
"timeout_millis": 60000,
4774
"retry_codes_name": "non_idempotent",
48-
"retry_params_name": "default",
75+
"retry_params_name": "non_idempotent_heavy_params",
4976
},
5077
"DropRowRange": {
5178
"timeout_millis": 900000,
5279
"retry_codes_name": "non_idempotent",
53-
"retry_params_name": "default",
80+
"retry_params_name": "drop_row_range_params",
5481
},
5582
"GenerateConsistencyToken": {
5683
"timeout_millis": 60000,
5784
"retry_codes_name": "idempotent",
58-
"retry_params_name": "default",
85+
"retry_params_name": "idempotent_params",
5986
},
6087
"CheckConsistency": {
6188
"timeout_millis": 60000,
6289
"retry_codes_name": "idempotent",
63-
"retry_params_name": "default",
90+
"retry_params_name": "idempotent_params",
6491
},
6592
"SnapshotTable": {
6693
"timeout_millis": 60000,
6794
"retry_codes_name": "non_idempotent",
68-
"retry_params_name": "default",
95+
"retry_params_name": "non_idempotent_params",
6996
},
7097
"GetSnapshot": {
7198
"timeout_millis": 60000,
7299
"retry_codes_name": "idempotent",
73-
"retry_params_name": "default",
100+
"retry_params_name": "idempotent_params",
74101
},
75102
"ListSnapshots": {
76103
"timeout_millis": 60000,
77104
"retry_codes_name": "idempotent",
78-
"retry_params_name": "default",
105+
"retry_params_name": "idempotent_params",
79106
},
80107
"DeleteSnapshot": {
81108
"timeout_millis": 60000,
82109
"retry_codes_name": "non_idempotent",
83-
"retry_params_name": "default",
110+
"retry_params_name": "non_idempotent_params",
84111
},
85112
},
86113
}

‎packages/google-cloud-bigtable/google/cloud/bigtable_v2/gapic/bigtable_client_config.py‎

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,55 +6,73 @@
66
"non_idempotent": [],
77
},
88
"retry_params": {
9-
"default": {
10-
"initial_retry_delay_millis": 100,
11-
"retry_delay_multiplier": 1.3,
9+
"idempotent_params": {
10+
"initial_retry_delay_millis": 10,
11+
"retry_delay_multiplier": 2.0,
1212
"max_retry_delay_millis": 60000,
1313
"initial_rpc_timeout_millis": 20000,
1414
"rpc_timeout_multiplier": 1.0,
1515
"max_rpc_timeout_millis": 20000,
1616
"total_timeout_millis": 600000,
1717
},
18-
"streaming": {
19-
"initial_retry_delay_millis": 100,
20-
"retry_delay_multiplier": 1.3,
18+
"non_idempotent_params": {
19+
"initial_retry_delay_millis": 10,
20+
"retry_delay_multiplier": 2.0,
2121
"max_retry_delay_millis": 60000,
2222
"initial_rpc_timeout_millis": 20000,
2323
"rpc_timeout_multiplier": 1.0,
2424
"max_rpc_timeout_millis": 20000,
25-
"total_timeout_millis": 3600000,
25+
"total_timeout_millis": 20000,
26+
},
27+
"read_rows_params": {
28+
"initial_retry_delay_millis": 10,
29+
"retry_delay_multiplier": 2.0,
30+
"max_retry_delay_millis": 60000,
31+
"initial_rpc_timeout_millis": 300000,
32+
"rpc_timeout_multiplier": 1.0,
33+
"max_rpc_timeout_millis": 300000,
34+
"total_timeout_millis": 43200000,
35+
},
36+
"mutate_rows_params": {
37+
"initial_retry_delay_millis": 10,
38+
"retry_delay_multiplier": 2.0,
39+
"max_retry_delay_millis": 60000,
40+
"initial_rpc_timeout_millis": 60000,
41+
"rpc_timeout_multiplier": 1.0,
42+
"ma D306 x_rpc_timeout_millis": 60000,
43+
"total_timeout_millis": 600000,
2644
},
2745
},
2846
"methods": {
2947
"ReadRows": {
30-
"timeout_millis": 3600000,
48+
"timeout_millis": 43200000,
3149
"retry_codes_name": "idempotent",
32-
"retry_params_name": "streaming",
50+
"retry_params_name": "read_rows_params",
3351
},
3452
"SampleRowKeys": {
35-
"timeout_millis": 60000,
53+
"timeout_millis": 20000,
3654
"retry_codes_name": "idempotent",
37-
"retry_params_name": "default",
55+
"retry_params_name": "idempotent_params",
3856
},
3957
"MutateRow": {
40-
"timeout_millis": 60000,
58+
"timeout_millis": 20000,
4159
"retry_codes_name": "idempotent",
42-
"retry_params_name": "default",
60+
"retry_params_name": "idempotent_params",
4361
},
4462
"MutateRows": {
4563
"timeout_millis": 60000,
4664
"retry_codes_name": "idempotent",
47-
"retry_params_name": "default",
65+
"retry_params_name": "mutate_rows_params",
4866
},
4967
"CheckAndMutateRow": {
50-
"timeout_millis": 60000,
68+
"timeout_millis": 20000,
5169
"retry_codes_name": "non_idempotent",
52-
"retry_params_name": "default",
70+
"retry_params_name": "non_idempotent_params",
5371
},
5472
"ReadModifyWriteRow": {
55-
"timeout_millis": 60000,
73+
"timeout_millis": 20000,
5674
"retry_codes_name": "non_idempotent",
57-
"retry_params_name": "default",
75+
"retry_params_name": "non_idempotent_params",
5876
},
5977
},
6078
}

0 commit comments

Comments
 (0)
0