Skip to content

Commit cbbd317

Browse files
Google APIscopybara-github
Google APIs
authored and
copybara-github
committed
feat: migrate bigtable retry/timeout settings to gRPC's service configs
Committer: @miraleung PiperOrigin-RevId: 346894665
1 parent 53eb251 commit cbbd317

4 files changed

Lines changed: 59 additions & 288 deletions

File tree

‎google/bigtable/admin/v2/bigtableadmin_gapic.yaml‎

Lines changed: 0 additions & 189 deletions
Original file line numberDiff line numberDiff line change
@@ -21,250 +21,61 @@ language_settings:
2121
package_name: admin.v2
2222
interfaces:
2323
- name: google.bigtable.admin.v2.BigtableInstanceAdmin
24-
retry_params_def:
25-
- name: idempotent_params
26-
initial_retry_delay_millis: 1000
27-
retry_delay_multiplier: 2
28-
max_retry_delay_millis: 60000
29-
initial_rpc_timeout_millis: 60000
30-
rpc_timeout_multiplier: 1
31-
max_rpc_timeout_millis: 60000
32-
total_timeout_millis: 600000
33-
- name: non_idempotent_params
34-
initial_retry_delay_millis: 0
35-
retry_delay_multiplier: 1
36-
max_retry_delay_millis: 0
37-
initial_rpc_timeout_millis: 60000
38-
rpc_timeout_multiplier: 1
39-
max_rpc_timeout_millis: 60000
40-
total_timeout_millis: 60000
41-
- name: non_idempotent_heavy_params
42-
initial_retry_delay_millis: 0
43-
retry_delay_multiplier: 1
44-
max_retry_delay_millis: 0
45-
initial_rpc_timeout_millis: 300000
46-
rpc_timeout_multiplier: 1
47-
max_rpc_timeout_millis: 300000
48-
total_timeout_millis: 300000
4924
methods:
5025
- name: CreateInstance
51-
retry_params_name: non_idempotent_heavy_params
5226
long_running:
5327
initial_poll_delay_millis: 500
5428
poll_delay_multiplier: 1.5
5529
max_poll_delay_millis: 5000
5630
total_poll_timeout_millis: 600000
57-
- name: GetInstance
58-
retry_params_name: idempotent_params
59-
- name: ListInstances
60-
retry_params_name: idempotent_params
61-
- name: UpdateInstance
62-
retry_codes_name: idempotent
63-
retry_params_name: idempotent_params
64-
surface_treatments:
65-
- include_languages: [java, csharp]
66-
visibility: DISABLED
6731
- name: PartialUpdateInstance
68-
retry_codes_name: idempotent
69-
retry_params_name: idempotent_params
7032
long_running:
7133
initial_poll_delay_millis: 500
7234
poll_delay_multiplier: 1.5
7335
max_poll_delay_millis: 5000
7436
total_poll_timeout_millis: 600000
75-
- name: DeleteInstance
76-
retry_params_name: non_idempotent_params
7737
- name: CreateCluster
78-
retry_params_name: non_idempotent_params
7938
long_running:
8039
initial_poll_delay_millis: 5000
8140
poll_delay_multiplier: 1.5
8241
max_poll_delay_millis: 60000
8342
total_poll_timeout_millis: 21600000
84-
- name: GetCluster
85-
retry_params_name: idempotent_params
86-
- name: ListClusters
87-
retry_params_name: idempotent_params
8843
- name: UpdateCluster
89-
retry_codes_name: idempotent
90-
retry_params_name: idempotent_params
9144
long_running:
9245
initial_poll_delay_millis: 500
9346
poll_delay_multiplier: 1.5
9447
max_poll_delay_millis: 5000
9548
total_poll_timeout_millis: 600000
96-
- name: DeleteCluster
97-
retry_params_name: non_idempotent_params
98-
- name: CreateAppProfile
99-
retry_params_name: non_idempotent_params
100-
- name: GetAppProfile
101-
retry_params_name: idempotent_params
102-
- name: ListAppProfiles
103-
retry_params_name: idempotent_params
10449
- name: UpdateAppProfile
105-
retry_codes_name: idempotent
106-
retry_params_name: idempotent_params
10750
long_running:
10851
initial_poll_delay_millis: 500
10952
poll_delay_multiplier: 1.5
11053
max_poll_delay_millis: 5000
11154
total_poll_timeout_millis: 600000
112-
- name: DeleteAppProfile
113-
retry_params_name: non_idempotent_params
114-
- name: GetIamPolicy
115-
retry_codes_name: idempotent
116-
retry_params_name: idempotent_params
117-
- name: SetIamPolicy
118-
retry_params_name: non_idempotent_params
119-
- name: TestIamPermissions
120-
retry_codes_name: idempotent
121-
retry_params_name: idempotent_params
12255

12356
- name: google.bigtable.admin.v2.BigtableTableAdmin
124-
retry_params_def:
125-
- name: idempotent_params
126-
initial_retry_delay_millis: 1000
127-
retry_delay_multiplier: 2
128-
max_retry_delay_millis: 60000
129-
initial_rpc_timeout_millis: 60000
130-
rpc_timeout_multiplier: 1
131-
max_rpc_timeout_millis: 60000
132-
total_timeout_millis: 600000
133-
- name: non_idempotent_params
134-
initial_retry_delay_millis: 0
135-
retry_delay_multiplier: 1
136-
max_retry_delay_millis: 0
137-
initial_rpc_timeout_millis: 60000
138-
rpc_timeout_multiplier: 1
139-
max_rpc_timeout_millis: 60000
140-
total_timeout_millis: 60000
141-
- name: non_idempotent_heavy_params
142-
initial_retry_delay_millis: 0
143-
retry_delay_multiplier: 1
144-
max_retry_delay_millis: 0
145-
initial_rpc_timeout_millis: 300000
146-
rpc_timeout_multiplier: 1
147-
max_rpc_timeout_millis: 300000
148-
total_timeout_millis: 300000
149-
- name: drop_row_range_params
150-
initial_retry_delay_millis: 0
151-
retry_delay_multiplier: 1
152-
max_retry_delay_millis: 0
153-
initial_rpc_timeout_millis: 3600000
154-
rpc_timeout_multiplier: 1
155-
max_rpc_timeout_millis: 3600000
156-
total_timeout_millis: 3600000
15757
methods:
158-
- name: CreateTable
159-
retry_params_name: non_idempotent_heavy_params
16058
- name: CreateTableFromSnapshot
161-
retry_params_name: non_idempotent_params
16259
long_running:
16360
initial_poll_delay_millis: 5000
16461
poll_delay_multiplier: 1.5
16562
max_poll_delay_millis: 60000
16663
total_poll_timeout_millis: 3600000
167-
# Snapshots are Alpha-only and not supported in C#
168-
surface_treatments:
169-
- include_languages: [csharp]
170-
visibility: DISABLED
171-
- name: ListTables
172-
retry_params_name: idempotent_params
173-
- name: GetTable
174-
retry_params_name: idempotent_params
175-
- name: DeleteTable
176-
retry_params_name: non_idempotent_params
177-
- name: ModifyColumnFamilies
178-
retry_params_name: non_idempotent_heavy_params
179-
- name: DropRowRange
180-
retry_params_name: drop_row_range_params
181-
- name: GenerateConsistencyToken
182-
retry_codes_name: idempotent
183-
retry_params_name: idempotent_params
184-
- name: CheckConsistency
185-
retry_codes_name: idempotent
186-
retry_params_name: idempotent_params
187-
- name: GetIamPolicy
188-
retry_codes_name: idempotent
189-
retry_params_name: idempotent_params
190-
- name: SetIamPolicy
191-
retry_params_name: non_idempotent_params
192-
- name: TestIamPermissions
193-
retry_codes_name: idempotent
194-
retry_params_name: idempotent_params
19564
- name: SnapshotTable
196-
retry_params_name: non_idempotent_params
19765
long_running:
19866
initial_poll_delay_millis: 500
19967
poll_delay_multiplier: 1.5
20068
max_poll_delay_millis: 5000
20169
total_poll_timeout_millis: 600000
202-
# Snapshots are Alpha-only and not supported in C#
203-
surface_treatments:
204-
- include_languages: [csharp]
205-
visibility: DISABLED
206-
- name: GetSnapshot
207-
retry_params_name: idempotent_params
208-
# Snapshots are Alpha-only and not supported in C#
209-
surface_treatments:
210-
- include_languages: [csharp]
211-
visibility: DISABLED
212-
- name: ListSnapshots
213-
retry_codes_name: idempotent
214-
retry_params_name: idempotent_params
215-
# Snapshots are Alpha-only and not supported in C#
216-
surface_treatments:
217-
- include_languages: [csharp]
218-
visibility: DISABLED
219-
- name: DeleteSnapshot
220-
retry_params_name: non_idempotent_params
221-
# Snapshots are Alpha-only and not supported in C#
222-
surface_treatments:
223-
- include_languages: [csharp]
224-
visibility: DISABLED
22570
- name: CreateBackup
226-
retry_params_name: non_idempotent_params
22771
long_running:
22872
initial_poll_delay_millis: 500
22973
poll_delay_multiplier: 1.5
23074
max_poll_delay_millis: 5000
23175
total_poll_timeout_millis: 600000
232-
# Managed Backup is in alpha and not supported in C#
233-
surface_treatments:
234-
- include_languages: [csharp]
235-
visibility: DISABLED
236-
- name: GetBackup
237-
retry_params_name: idempotent_params
238-
# Managed Backup is in alpha and not supported in C#
239-
surface_treatments:
240-
- include_languages: [csharp]
241-
visibility: DISABLED
242-
- name: ListBackups
243-
retry_params_name: idempotent_params
244-
# Managed Backup is in alpha and not supported in C#
245-
surface_treatments:
246-
- include_languages: [csharp]
247-
visibility: DISABLED
248-
- name: UpdateBackup
249-
retry_params_name: non_idempotent_params
250-
# Managed Backup is in alpha and not supported in C#
251-
surface_treatments:
252-
- include_languages: [csharp]
253-
visibility: DISABLED
254-
- name: DeleteBackup
255-
retry_params_name: non_idempotent_params
256-
# Managed Backup is in alpha and not supported in C#
257-
surface_treatments:
258-
- include_languages: [csharp]
259-
visibility: DISABLED
26076
- name: RestoreTable
261-
retry_params_name: non_idempotent_params
26277
long_running:
26378
initial_poll_delay_millis: 500
26479
poll_delay_multiplier: 1.5
26580
max_poll_delay_millis: 5000
26681
total_poll_timeout_millis: 600000
267-
# Managed Backup is in alpha and not supported in C#
268-
surface_treatments:
269-
- include_languages: [csharp]
270-
visibility: DISABLED

‎google/bigtable/admin/v2/bigtableadmin_grpc_service_config.json‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717
"name": [
1818
{
1919
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
20-
"method": "CreateTableFromSnapshot"
20+
"method": "DeleteTable"
2121
},
2222
{
2323
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
24-
"method": "DeleteTable"
24+
"method": "SetIamPolicy"
2525
},
2626
{
2727
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
28-
"method": "SetIamPolicy"
28+
"method": "DeleteSnapshot"
2929
},
3030
{
3131
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
32-
"method": "SnapshotTable"
32+
"method": "UpdateBackup"
3333
},
3434
{
3535
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
36-
"method": "DeleteSnapshot"
36+
"method": "DeleteBackup"
3737
}
3838
],
3939
"timeout": "60s"
@@ -48,6 +48,28 @@
4848
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
4949
"method": "GetTable"
5050
},
51+
{
52+
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
53+
"method": "GetSnapshot"
54+
},
55+
{
56+
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
57+
"method": "GetBackup"
58+
},
59+
{
60+
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
61+
"method": "ListBackups"
62+
}
63+
],
64+
"timeout": "60s",
65+
"retryPolicy": {
66+
"initialBackoff": "1s",
67+
"maxBackoff": "60s",
68+
"backoffMultiplier": 2
69+
}
70+
},
71+
{
72+
"name": [
5173
{
5274
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
5375
"method": "GenerateConsistencyToken"
@@ -64,18 +86,13 @@
6486
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
6587
"method": "TestIamPermissions"
6688
},
67-
{
68-
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
69-
"method": "GetSnapshot"
70-
},
7189
{
7290
"service": "google.bigtable.admin.v2.BigtableTableAdmin",
7391
"method": "ListSnapshots"
7492
}
7593
],
7694
"timeout": "60s",
7795
"retryPolicy": {
78-
"maxAttempts": 5,
7996
"initialBackoff": "1s",
8097
"maxBackoff": "60s",
8198
"backoffMultiplier": 2,
@@ -115,35 +132,35 @@
115132
},
116133
{
117134
"service": "google.bigtable.admin.v2.BigtableInstanceAdmin",
118-
"method": "UpdateInstance"
135+
"method": "GetCluster"
119136
},
120137
{
121138
"service": "google.bigtable.admin.v2.BigtableInstanceAdmin",
122-
"method": "PartialUpdateInstance"
139+
"method": "UpdateCluster"
123140
},
124141
{
125142
"service": "google.bigtable.admin.v2.BigtableInstanceAdmin",
126-
"method": "GetCluster"
143+
"method": "ListClusters"
127144
},
128145
{
129146
"service": "google.bigtable.admin.v2.BigtableInstanceAdmin",
130-
"method": "ListClusters"
147+
"method": "GetAppProfile"
131148
},
132149
{
133150
"service": "google.bigtable.admin.v2.BigtableInstanceAdmin",
134-
"method": "UpdateCluster"
151+
"method": "ListAppProfiles"
135152
},
136153
{
137154
"service": "google.bigtable.admin.v2.BigtableInstanceAdmin",
138-
"method": "GetAppProfile"
155+
"method": "UpdateAppProfile"
139156
},
140157
{
141158
"service": "google.bigtable.admin.v2.BigtableInstanceAdmin",
142-
"method": "ListAppProfiles"
159+
"method": "UpdateInstance"
143160
},
144161
{
145162
"service": "google.bigtable.admin.v2.BigtableInstanceAdmin",
146-
"method": "UpdateAppProfile"
163+
"method": "PartialUpdateInstance"
147164
},
148165
{
149166
"service": "google.bigtable.admin.v2.BigtableInstanceAdmin",
@@ -172,10 +189,6 @@
172189
"service": "google.bigtable.admin.v2.BigtableInstanceAdmin",
173190
"method": "DeleteInstance"
174191
},
175-
{
176-
"service": "google.bigtable.admin.v2.BigtableInstanceAdmin",
177-
"method": "CreateCluster"
178-
},
179192
{
180193
"service": "google.bigtable.admin.v2.BigtableInstanceAdmin",
181194
"method": "DeleteCluster"

0 commit comments

Comments
 (0)