Skip to content

Commit 451bba9

Browse files
yoshi-automationbcoe
yoshi-automation
authored and
bcoe
committed
fix: modified timeout and retry parameters
1 parent 061a28b commit 451bba9

4 files changed

+126
-65
lines changed

‎src/v2/bigtable_client_config.json

+36-18
Original file line numberDiff line numberDiff line change
@@ -9,55 +9,73 @@
99
"non_idempotent": []
1010
},
1111
"retry_params": {
12-
"default": {
13-
"initial_retry_delay_millis": 100,
14-
"retry_delay_multiplier": 1.3,
12+
"idempotent_params": {
13+
"initial_retry_delay_millis": 10,
14+
"retry_delay_multiplier": 2.0,
1515
"max_retry_delay_millis": 60000,
1616
"initial_rpc_timeout_millis": 20000,
1717
"rpc_timeout_multiplier": 1.0,
1818
"max_rpc_timeout_millis": 20000,
1919
"total_timeout_millis": 600000
2020
},
21-
"streaming": {
22-
"initial_retry_delay_millis": 100,
23-
"retry_delay_multiplier": 1.3,
21+
"non_idempotent_params": {
22+
"initial_retry_delay_millis": 10,
23+
"retry_delay_multiplier": 2.0,
2424
"max_retry_delay_millis": 60000,
2525
"initial_rpc_timeout_millis": 20000,
2626
"rpc_timeout_multiplier": 1.0,
2727
"max_rpc_timeout_millis": 20000,
28-
"total_timeout_millis": 3600000
28+
"total_timeout_millis": 20000
29+
},
30+
"read_rows_params": {
31+
"initial_retry_delay_millis": 10,
32+
"retry_delay_multiplier": 2.0,
33+
"max_retry_delay_millis": 60000,
34+
"initial_rpc_timeout_millis": 300000,
35+
"rpc_timeout_multiplier": 1.0,
36+
"max_rpc_timeout_millis": 300000,
37+
"total_timeout_millis": 43200000
38+
},
39+
"mutate_rows_params": {
40+
"initial_retry_delay_millis": 10,
41+
"retry_delay_multiplier": 2.0,
42+
"max_retry_delay_millis": 60000,
43+
"initial_rpc_timeout_millis": 60000,
44+
"rpc_timeout_multiplier": 1.0,
45+
"max_rpc_timeout_millis": 60000,
46+
"total_timeout_millis": 600000
2947
}
3048
},
3149
"methods": {
3250
"ReadRows": {
33-
"timeout_millis": 3600000,
51+
"timeout_millis": 43200000,
3452
"retry_codes_name": "idempotent",
35-
"retry_params_name": "streaming"
53+
"retry_params_name": "read_rows_params"
3654
},
3755
"SampleRowKeys": {
38-
"timeout_millis": 60000,
56+
"timeout_millis": 20000,
3957
"retry_codes_name": "idempotent",
40-
"retry_params_name": "default"
58+
"retry_params_name": "idempotent_params"
4159
},
4260
"MutateRow": {
43-
"timeout_millis": 60000,
61+
"timeout_millis": 20000,
4462
"retry_codes_name": "idempotent",
45-
"retry_params_name": "default"
63+
"retry_params_name": "idempotent_params"
4664
},
4765
"MutateRows": {
4866
"timeout_millis": 60000,
4967
"retry_codes_name": "idempotent",
50-
"retry_params_name": "default"
68+
"retry_params_name": "mutate_rows_params"
5169
},
5270
"CheckAndMutateRow": {
53-
"timeout_millis": 60000,
71+
"timeout_millis": 20000,
5472
"retry_codes_name": "non_idempotent",
55-
"retry_params_name": "default"
73+
"retry_params_name": "non_idempotent_params"
5674
},
5775
"ReadModifyWriteRow": {
58-
"timeout_millis": 60000,
76+
"timeout_millis": 20000,
5977
"retry_codes_name": "non_idempotent",
60-
"retry_params_name": "default"
78+
"retry_params_name": "non_idempotent_params"
6179
}
6280
}
6381
}

‎src/v2/bigtable_instance_admin_client_config.json

+40-24
Original file line numberDiff line numberDiff line change
@@ -6,116 +6,132 @@
66
"DEADLINE_EXCEEDED",
77
"UNAVAILABLE"
88
],
9-
"non_idempotent": [
10-
"UNAVAILABLE"
11-
]
9+
"non_idempotent": []
1210
},
1311
"retry_params": {
14-
"default": {
15-
"initial_retry_delay_millis": 5,
12+
"idempotent_params": {
13+
"initial_retry_delay_millis": 1000,
1614
"retry_delay_multiplier": 2.0,
1715
"max_retry_delay_millis": 60000,
1816
"initial_rpc_timeout_millis": 60000,
1917
"rpc_timeout_multiplier": 1.0,
2018
"max_rpc_timeout_millis": 60000,
2119
"total_timeout_millis": 600000
20+
},
21+
"non_idempotent_params": {
22+
"initial_retry_delay_millis": 0,
23+
"retry_delay_multiplier": 1.0,
24+
"max_retry_delay_millis": 0,
25+
"initial_rpc_timeout_millis": 60000,
26+
"rpc_timeout_multiplier": 1.0,
27+
"max_rpc_timeout_millis": 60000,
28+
"total_timeout_millis": 60000
29+
},
30+
"non_idempotent_heavy_params": {
31+
"initial_retry_delay_millis": 0,
32+
"retry_delay_multiplier": 1.0,
33+
"max_retry_delay_millis": 0,
34+
"initial_rpc_timeout_millis": 300000,
35+
"rpc_timeout_multiplier": 1.0,
36+
"max_rpc_timeout_millis": 300000,
37+
"total_timeout_millis": 300000
2238
}
2339
},
2440
"methods": {
2541
"CreateInstance": {
2642
"timeout_millis": 60000,
2743
"retry_codes_name": "non_idempotent",
28-
"retry_params_name": "default"
44+
"retry_params_name": "non_idempotent_heavy_params"
2945
},
3046
"GetInstance": {
3147
"timeout_millis": 60000,
3248
"retry_codes_name": "idempotent",
33-
"retry_params_name": "default"
49+
"retry_params_name": "idempotent_params"
3450
},
3551
"ListInstances": {
3652
"timeout_millis": 60000,
3753
"retry_codes_name": "idempotent",
38-
"retry_params_name": "default"
54+
"retry_params_name": "idempotent_params"
3955
},
4056
"UpdateInstance": {
4157
"timeout_millis": 60000,
4258
"retry_codes_name": "idempotent",
43-
"retry_params_name": "default"
59+
"retry_params_name": "idempotent_params"
4460
},
4561
"PartialUpdateInstance": {
4662
"timeout_millis": 60000,
4763
"retry_codes_name": "idempotent",
48-
"retry_params_name": "default"
64+
"retry_params_name": "idempotent_params"
4965
},
5066
"DeleteInstance": {
5167
"timeout_millis": 60000,
5268
"retry_codes_name": "non_idempotent",
53-
"retry_params_name": "default"
69+
"retry_params_name": "non_idempotent_params"
5470
},
5571
"CreateCluster": {
5672
"timeout_millis": 60000,
5773
"retry_codes_name": "non_idempotent",
58-
"retry_params_name": "default"
74+
"retry_params_name": "non_idempotent_params"
5975
},
6076
"GetCluster": {
6177
"timeout_millis": 60000,
6278
"retry_codes_name": "idempotent",
63-
"retry_params_name": "default"
79+
"retry_params_name": "idempotent_params"
6480
},
6581
"ListClusters": {
6682
"timeout_millis": 60000,
6783
"retry_codes_name": "idempotent",
68-
"retry_params_name": "default"
84+
"retry_params_name": "idempotent_params"
6985
},
7086
"UpdateCluster": {
7187
"timeout_millis": 60000,
7288
"retry_codes_name": "idempotent",
73-
"retry_params_name": "default"
89+
"retry_params_name": "idempotent_params"
7490
},
7591
"DeleteCluster": {
7692
"timeout_millis": 60000,
7793
"retry_codes_name": "non_idempotent",
78-
"retry_params_name": "default"
94+
"retry_params_name": "non_idempotent_params"
7995
},
8096
"CreateAppProfile": {
8197
"timeout_millis": 60000,
8298
"retry_codes_name": "non_idempotent",
83-
"retry_params_name": "default"
99+
"retry_params_name": "non_idempotent_params"
84100
},
85101
"GetAppProfile": {
86102
"timeout_millis": 60000,
87103
"retry_codes_name": "idempotent",
88-
"retry_params_name": "default"
104+
"retry_params_name": "idempotent_params"
89105
},
90106
"ListAppProfiles": {
91107
"timeout_millis": 60000,
92108
"retry_codes_name": "idempotent",
93-
"retry_params_name": "default"
109+
"retry_params_name": "idempotent_params"
94110
},
95111
"UpdateAppProfile": {
96112
"timeout_millis": 60000,
97113
"retry_codes_name": "idempotent",
98-
"retry_params_name": "default"
114+
"retry_params_name": "idempotent_params"
99115
},
100116
"DeleteAppProfile": {
101117
"timeout_millis": 60000,
102118
"retry_codes_name": "non_idempotent",
103-
"retry_params_name": "default"
119+
"retry_params_name": "non_idempotent_params"
104120
},
105121
"GetIamPolicy": {
106122
"timeout_millis": 60000,
107123
"retry_codes_name": "idempotent",
108-
"retry_params_name": "default"
124+
"retry_params_name": "idempotent_params"
109125
},
110126
"SetIamPolicy": {
111127
"timeout_millis": 60000,
112128
"retry_codes_name": "non_idempotent",
113-
"retry_params_name": "default"
129+
"retry_params_name": "non_idempotent_params"
114130
},
115131
"TestIamPermissions": {
116132
"timeout_millis": 60000,
117133
"retry_codes_name": "idempotent",
118-
"retry_params_name": "default"
134+
"retry_params_name": "idempotent_params"
119135
}
120136
}
121137
}

‎src/v2/bigtable_table_admin_client_config.json

+45-18
Original file line numberDiff line numberDiff line change
@@ -9,81 +9,108 @@
99
"non_idempotent": []
1010
},
1111
"retry_params": {
12-
"default": {
13-
"initial_retry_delay_millis": 100,
14-
"retry_delay_multiplier": 1.3,
12+
"idempotent_params": {
13+
"initial_retry_delay_millis": 1000,
14+
"retry_delay_multiplier": 2.0,
1515
"max_retry_delay_millis": 60000,
16-
"initial_rpc_timeout_millis": 20000,
16+
"initial_rpc_timeout_millis": 60000,
1717
"rpc_timeout_multiplier": 1.0,
18-
"max_rpc_timeout_millis": 20000,
18+
"max_rpc_timeout_millis": 60000,
1919
"total_timeout_millis": 600000
20+
},
21+
"non_idempotent_params": {
22+
"initial_retry_delay_millis": 0,
23+
"retry_delay_multiplier": 1.0,
24+
"max_retry_delay_millis": 0,
25+
"initial_rpc_timeout_millis": 60000,
26+
"rpc_timeout_multiplier": 1.0,
27+
"max_rpc_timeout_millis": 60000,
28+
"total_timeout_millis": 60000
29+
},
30+
"non_idempotent_heavy_params": {
31+
"initial_retry_delay_millis": 0,
32+
"retry_delay_multiplier": 1.0,
33+
"max_retry_delay_millis": 0,
34+
"initial_rpc_timeout_millis": 300000,
35+
"rpc_timeout_multiplier": 1.0,
36+
"max_rpc_timeout_millis": 300000,
37+
"total_timeout_millis": 300000
38+
},
39+
"drop_row_range_params": {
40+
"initial_retry_delay_millis": 0,
41+
"retry_delay_multiplier": 1.0,
42+
"max_retry_delay_millis": 0,
43+
"initial_rpc_timeout_millis": 3600000,
44+
"rpc_timeout_multiplier": 1.0,
45+
"max_rpc_timeout_millis": 3600000,
46+
"total_timeout_millis": 3600000
2047
}
2148
},
2249
"methods": {
2350
"CreateTable": {
2451
"timeout_millis": 130000,
2552
"retry_codes_name": "non_idempotent",
26-
"retry_params_name": "default"
53+
"retry_params_name": "non_idempotent_heavy_params"
2754
},
2855
"CreateTableFromSnapshot": {
2956
"timeout_millis": 60000,
3057
"retry_codes_name": "non_idempotent",
31-
"retry_params_name": "default"
58+
"retry_params_name": "non_idempotent_params"
3259
},
3360
"ListTables": {
3461
"timeout_millis": 60000,
3562
"retry_codes_name": "idempotent",
36-
"retry_params_name": "default"
63+
"retry_params_name": "idempotent_params"
3764
},
3865
"GetTable": {
3966
"timeout_millis": 60000,
4067
"retry_codes_name": "idempotent",
41-
"retry_params_name": "default"
68+
"retry_params_name": "idempotent_params"
4269
},
4370
"DeleteTable": {
4471
"timeout_millis": 60000,
4572
"retry_codes_name": "non_idempotent",
46-
"retry_params_name": "default"
73+
"retry_params_name": "non_idempotent_params"
4774
},
4875
"ModifyColumnFamilies": {
4976
"timeout_millis": 60000,
5077
"retry_codes_name": "non_idempotent",
51-
"retry_params_name": "default"
78+
"retry_params_name": "non_idempotent_heavy_params"
5279
},
5380
"DropRowRange": {
5481
"timeout_millis": 900000,
5582
"retry_codes_name": "non_idempotent",
56-
"retry_params_name": "default"
83+
"retry_params_name": "drop_row_range_params"
5784
},
5885
"GenerateConsistencyToken": {
5986
"timeout_millis": 60000,
6087
"retry_codes_name": "idempotent",
61-
"retry_params_name": "default"
88+
"retry_params_name": "idempotent_params"
6289
},
6390
"CheckConsistency": {
6491
"timeout_millis": 60000,
6592
"retry_codes_name": "idempotent",
66-
"retry_params_name": "default"
93+
"retry_params_name": "idempotent_params"
6794
},
6895
"SnapshotTable": {
6996
"timeout_millis": 60000,
7097
"retry_codes_name": "non_idempotent",
71-
"retry_params_name": "default"
98+
"retry_params_name": "non_idempotent_params"
7299
},
73100
"GetSnapshot": {
74101
"timeout_millis": 60000,
75102
"retry_codes_name": "idempotent",
76-
"retry_params_name": "default"
103+
"retry_params_name": "idempotent_params"
77104
},
78105
"ListSnapshots": {
79106
"timeout_millis": 60000,
80107
"retry_codes_name": "idempotent",
81-
"retry_params_name": "default"
108+
"retry_params_name": "idempotent_params"
82109
},
83110
"DeleteSnapshot": {
84111
"timeout_millis": 60000,
85112
"retry_codes_name": "non_idempotent",
86-
"retry_params_name": "default"
113+
"retry_params_name": "non_idempotent_params"
87114
}
88115
}
89116
}

0 commit comments

Comments
 (0)