Skip to content

Commit 385ab33

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: add WarmAndPing request for channel priming (#1178)
* feat: add WarmAndPing request for channel priming PiperOrigin-RevId: 428795660 Source-Link: googleapis/googleapis@6cce671 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2282bc1b081364ea783300be91a8c14cb4a718c4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjI4MmJjMWIwODEzNjRlYTc4MzMwMGJlOTFhOGMxNGNiNGE3MThjNCJ9 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 7ff5fa7 commit 385ab33

File tree

13 files changed

+1966
-110
lines changed

13 files changed

+1966
-110
lines changed

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/gapic_metadata.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
"MutateRows": {
2020
"methods": ["mutateRowsCallable"]
2121
},
22+
"PingAndWarm": {
23+
"methods": ["pingAndWarm", "pingAndWarm", "pingAndWarm", "pingAndWarm", "pingAndWarm", "pingAndWarmCallable"]
24+
},
2225
"ReadModifyWriteRow": {
2326
"methods": ["readModifyWriteRow", "readModifyWriteRow", "readModifyWriteRow", "readModifyWriteRow", "readModifyWriteRow", "readModifyWriteRowCallable"]
2427
},

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStub.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import com.google.bigtable.v2.MutateRowResponse;
2727
import com.google.bigtable.v2.MutateRowsRequest;
2828
import com.google.bigtable.v2.MutateRowsResponse;
29+
import com.google.bigtable.v2.PingAndWarmRequest;
30+
import com.google.bigtable.v2.PingAndWarmResponse;
2931
import com.google.bigtable.v2.ReadModifyWriteRowRequest;
3032
import com.google.bigtable.v2.ReadModifyWriteRowResponse;
3133
import com.google.bigtable.v2.ReadRowsRequest;
@@ -62,6 +64,10 @@ public ServerStreamingCallable<MutateRowsRequest, MutateRowsResponse> mutateRows
6264
throw new UnsupportedOperationException("Not implemented: checkAndMutateRowCallable()");
6365
}
6466

67+
public UnaryCallable<PingAndWarmRequest, PingAndWarmResponse> pingAndWarmCallable() {
68+
throw new UnsupportedOperationException("Not implemented: pingAndWarmCallable()");
69+
}
70+
6571
public UnaryCallable<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse>
6672
readModifyWriteRowCallable() {
6773
throw new UnsupportedOperationException("Not implemented: readModifyWriteRowCallable()");

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java‎

Lines changed: 53 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
import com.google.bigtable.v2.MutateRowResponse;
4040
import com.google.bigtable.v2.MutateRowsRequest;
4141
import com.google.bigtable.v2.MutateRowsResponse;
42+
import com.google.bigtable.v2.PingAndWarmRequest;
43+
import com.google.bigtable.v2.PingAndWarmResponse;
4244
import com.google.bigtable.v2.ReadModifyWriteRowRequest;
4345
import com.google.bigtable.v2.ReadModifyWriteRowResponse;
4446
import com.google.bigtable.v2.ReadRowsRequest;
@@ -78,6 +80,7 @@ public class BigtableStubSettings extends StubSettings<BigtableStubSettings> {
7880
mutateRowsSettings;
7981
private final UnaryCallSettings<CheckAndMutateRowRequest, CheckAndMutateRowResponse>
8082
checkAndMutateRowSettings;
83+
private final UnaryCallSettings<PingAndWarmRequest, PingAndWarmResponse> pingAndWarmSettings;
8184
private final UnaryCallSettings<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse>
8285
readModifyWriteRowSettings;
8386

@@ -108,6 +111,11 @@ public ServerStreamingCallSettings<MutateRowsRequest, MutateRowsResponse> mutate
108111
return checkAndMutateRowSettings;
109112
}
110113

114+
/** Returns the object with the settings used for calls to pingAndWarm. */
115+
public UnaryCallSettings<PingAndWarmRequest, PingAndWarmResponse> pingAndWarmSettings() {
116+
return pingAndWarmSettings;
117+
}
118+
111119
/** Returns the object with the settings used for calls to readModifyWriteRow. */
112120
public UnaryCallSettings<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse>
113121
readModifyWriteRowSettings() {
@@ -194,6 +202,7 @@ protected BigtableStubSettings(Builder settingsBuilder) throws IOException {
194202
mutateRowSettings = settingsBuilder.mutateRowSettings().build();
195203
mutateRowsSettings = settingsBuilder.mutateRowsSettings().build();
196204
checkAndMutateRowSettings = settingsBuilder.checkAndMutateRowSettings().build();
205+
pingAndWarmSettings = settingsBuilder.pingAndWarmSettings().build();
197206
readModifyWriteRowSettings = settingsBuilder.readModifyWriteRowSettings().build();
198207
}
199208

@@ -209,6 +218,8 @@ public static class Builder extends StubSettings.Builder<BigtableStubSettings, B
209218
mutateRowsSettings;
210219
private final UnaryCallSettings.Builder<CheckAndMutateRowRequest, CheckAndMutateRowResponse>
211220
checkAndMutateRowSettings;
221+
private final UnaryCallSettings.Builder<PingAndWarmRequest, PingAndWarmResponse>
222+
pingAndWarmSettings;
212223
private final UnaryCallSettings.Builder<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse>
213224
readModifyWriteRowSettings;
214225
private static final ImmutableMap<String, ImmutableSet<StatusCode.Code>>
@@ -218,18 +229,19 @@ public static class Builder extends StubSettings.Builder<BigtableStubSettings, B
218229
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
219230
ImmutableMap.builder();
220231
definitions.put(
221-
"retry_policy_3_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
232+
"no_retry_3_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
222233
definitions.put(
223-
"retry_policy_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
234+
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
224235
definitions.put(
225236
"retry_policy_4_codes",
226237
ImmutableSet.copyOf(
227238
Lists.<StatusCode.Code>newArrayList(
228239
StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
229240
definitions.put(
230-
"retry_policy_2_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
241+
"no_retry_2_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
231242
definitions.put(
232-
"retry_policy_0_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
243+
"no_retry_0_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
244+
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
233245
RETRYABLE_CODE_DEFINITIONS = definitions.build();
234246
}
235247

@@ -240,26 +252,20 @@ public static class Builder extends StubSettings.Builder<BigtableStubSettings, B
240252
RetrySettings settings = null;
241253
settings =
242254
RetrySettings.newBuilder()
243-
.setInitialRetryDelay(Duration.ofMillis(10L))
244-
.setRetryDelayMultiplier(2.0)
245-
.setMaxRetryDelay(Duration.ofMillis(60000L))
246255
.setInitialRpcTimeout(Duration.ofMillis(43200000L))
247256
.setRpcTimeoutMultiplier(1.0)
248257
.setMaxRpcTimeout(Duration.ofMillis(43200000L))
249258
.setTotalTimeout(Duration.ofMillis(43200000L))
250259
.build();
251-
definitions.put("retry_policy_3_params", settings);
260+
definitions.put("no_retry_3_params", settings);
252261
settings =
253262
RetrySettings.newBuilder()
254-
.setInitialRetryDelay(Duration.ofMillis(10L))
255-
.setRetryDelayMultiplier(2.0)
256-
.setMaxRetryDelay(Duration.ofMillis(60000L))
257263
.setInitialRpcTimeout(Duration.ofMillis(60000L))
258264
.setRpcTimeoutMultiplier(1.0)
259265
.setMaxRpcTimeout(Duration.ofMillis(60000L))
260266
.setTotalTimeout(Duration.ofMillis(60000L))
261267
.build();
262-
definitions.put("retry_policy_1_params", settings);
268+
definitions.put("no_retry_1_params", settings);
263269
settings =
264270
RetrySettings.newBuilder()
265271
.setInitialRetryDelay(Duration.ofMillis(10L))
@@ -273,26 +279,22 @@ public static class Builder extends StubSettings.Builder<BigtableStubSettings, B
273279
definitions.put("retry_policy_4_params", settings);
274280
settings =
275281
RetrySettings.newBuilder()
276-
.setInitialRetryDelay(Duration.ofMillis(10L))
277-
.setRetryDelayMultiplier(2.0)
278-
.setMaxRetryDelay(Duration.ofMillis(60000L))
279282
.setInitialRpcTimeout(Duration.ofMillis(600000L))
280283
.setRpcTimeoutMultiplier(1.0)
281284
.setMaxRpcTimeout(Duration.ofMillis(600000L))
282285
.setTotalTimeout(Duration.ofMillis(600000L))
283286
.build();
284-
definitions.put("retry_policy_2_params", settings);
287+
definitions.put("no_retry_2_params", settings);
285288
settings =
286289
RetrySettings.newBuilder()
287-
.setInitialRetryDelay(Duration.ofMillis(10L))
288-
.setRetryDelayMultiplier(2.0)
289-
.setMaxRetryDelay(Duration.ofMillis(60000L))
290290
.setInitialRpcTimeout(Duration.ofMillis(20000L))
291291
.setRpcTimeoutMultiplier(1.0)
292292
.setMaxRpcTimeout(Duration.ofMillis(20000L))
293293
.setTotalTimeout(Duration.ofMillis(20000L))
294294
.build();
295-
definitions.put("retry_policy_0_params", settings);
295+
definitions.put("no_retry_0_params", settings);
296+
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
297+
definitions.put("no_retry_params", settings);
296298
RETRY_PARAM_DEFINITIONS = definitions.build();
297299
}
298300

@@ -308,11 +310,15 @@ protected Builder(ClientContext clientContext) {
308310
mutateRowSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
309311
mutateRowsSettings = ServerStreamingCallSettings.newBuilder();
310312
checkAndMutateRowSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
313+
pingAndWarmSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
311314
readModifyWriteRowSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
312315

313316
unaryMethodSettingsBuilders =
314317
ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
315-
mutateRowSettings, checkAndMutateRowSettings, readModifyWriteRowSettings);
318+
mutateRowSettings,
319+
checkAndMutateRowSettings,
320+
pingAndWarmSettings,
321+
readModifyWriteRowSettings);
316322
initDefaults(this);
317323
}
318324

@@ -324,11 +330,15 @@ protected Builder(BigtableStubSettings settings) {
324330
mutateRowSettings = settings.mutateRowSettings.toBuilder();
325331
mutateRowsSettings = settings.mutateRowsSettings.toBuilder();
326332
checkAndMutateRowSettings = settings.checkAndMutateRowSettings.toBuilder();
333+
pingAndWarmSettings = settings.pingAndWarmSettings.toBuilder();
327334
readModifyWriteRowSettings = settings.readModifyWriteRowSettings.toBuilder();
328335

329336
unaryMethodSettingsBuilders =
330337
ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
331-
mutateRowSettings, checkAndMutateRowSettings, readModifyWriteRowSettings);
338+
mutateRowSettings,
339+
checkAndMutateRowSettings,
340+
pingAndWarmSettings,
341+
readModifyWriteRowSettings);
332342
}
333343

334344
private static Builder createDefault() {
@@ -347,13 +357,13 @@ private static Builder createDefault() {
347357
private static Builder initDefaults(Builder builder) {
348358
builder
349359
.readRowsSettings()
350-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_3_codes"))
351-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_3_params"));
360+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
361+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"));
352362

353363
builder
354364
.sampleRowKeysSettings()
355-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
356-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
365+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
366+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
357367

358368
builder
359369
.mutateRowSettings()
@@ -362,18 +372,23 @@ private static Builder initDefaults(Builder builder) {
362372

363373
builder
364374
.mutateRowsSettings()
365-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
366-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"));
375+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_2_codes"))
376+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_2_params"));
367377

368378
builder
369379
.checkAndMutateRowSettings()
370-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
371-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
380+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
381+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"));
382+
383+
builder
384+
.pingAndWarmSettings()
385+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
386+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));
372387

373388
builder
374389
.readModifyWriteRowSettings()
375-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
376-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
390+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
391+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"));
377392

378393
return builder;
379394
}
@@ -422,6 +437,12 @@ public UnaryCallSettings.Builder<MutateRowRequest, MutateRowResponse> mutateRowS
422437
return checkAndMutateRowSettings;
423438
}
424439

440+
/** Returns the builder for the settings used for calls to pingAndWarm. */
441+
public UnaryCallSettings.Builder<PingAndWarmRequest, PingAndWarmResponse>
442+
pingAndWarmSettings() {
443+
return pingAndWarmSettings;
444+
}
445+
425446
/** Returns the builder for the settings used for calls to readModifyWriteRow. */
426447
public UnaryCallSettings.Builder<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse>
427448
readModifyWriteRowSettings() {

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/GrpcBigtableStub.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
import com.google.bigtable.v2.MutateRowResponse;
3333
import com.google.bigtable.v2.MutateRowsRequest;
3434
import com.google.bigtable.v2.MutateRowsResponse;
35+
import com.google.bigtable.v2.PingAndWarmRequest;
36+
import com.google.bigtable.v2.PingAndWarmResponse;
3537
import com.google.bigtable.v2.ReadModifyWriteRowRequest;
3638
import com.google.bigtable.v2.ReadModifyWriteRowResponse;
3739
import com.google.bigtable.v2.ReadRowsRequest;
@@ -99,6 +101,16 @@ public class GrpcBigtableStub extends BigtableStub {
99101
ProtoUtils.marshaller(CheckAndMutateRowResponse.getDefaultInstance()))
100102
.build();
101103

104+
private static final MethodDescriptor<PingAndWarmRequest, PingAndWarmResponse>
105+
pingAndWarmMethodDescriptor =
106+
MethodDescriptor.<PingAndWarmRequest, PingAndWarmResponse>newBuilder()
107+
.setType(MethodDescriptor.MethodType.UNARY)
108+
.setFullMethodName("google.bigtable.v2.Bigtable/PingAndWarm")
109+
.setRequestMarshaller(ProtoUtils.marshaller(PingAndWarmRequest.getDefaultInstance()))
110+
.setResponseMarshaller(
111+
ProtoUtils.marshaller(PingAndWarmResponse.getDefaultInstance()))
112+
.build();
113+
102114
private static final MethodDescriptor<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse>
103115
readModifyWriteRowMethodDescriptor =
104116
MethodDescriptor.<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse>newBuilder()
@@ -117,6 +129,7 @@ public class GrpcBigtableStub extends BigtableStub {
117129
private final ServerStreamingCallable<MutateRowsRequest, MutateRowsResponse> mutateRowsCallable;
118130
private final UnaryCallable<CheckAndMutateRowRequest, CheckAndMutateRowResponse>
119131
checkAndMutateRowCallable;
132+
private final UnaryCallable<PingAndWarmRequest, PingAndWarmResponse> pingAndWarmCallable;
120133
private final UnaryCallable<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse>
121134
readModifyWriteRowCallable;
122135

@@ -144,6 +157,10 @@ public class GrpcBigtableStub extends BigtableStub {
144157
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}");
145158
private static final PathTemplate CHECK_AND_MUTATE_ROW_1_PATH_TEMPLATE =
146159
PathTemplate.create("{app_profile_id=**}");
160+
private static final PathTemplate PING_AND_WARM_0_PATH_TEMPLATE =
161+
PathTemplate.create("{name=projects/*/instances/*}");
162+
private static final PathTemplate PING_AND_WARM_1_PATH_TEMPLATE =
163+
PathTemplate.create("{app_profile_id=**}");
147164
private static final PathTemplate READ_MODIFY_WRITE_ROW_0_PATH_TEMPLATE =
148165
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}");
149166
private static final PathTemplate READ_MODIFY_WRITE_ROW_1_PATH_TEMPLATE =
@@ -251,6 +268,18 @@ protected GrpcBigtableStub(
251268
return builder.build();
252269
})
253270
.build();
271+
GrpcCallSettings<PingAndWarmRequest, PingAndWarmResponse> pingAndWarmTransportSettings =
272+
GrpcCallSettings.<PingAndWarmRequest, PingAndWarmResponse>newBuilder()
273+
.setMethodDescriptor(pingAndWarmMethodDescriptor)
274+
.setParamsExtractor(
275+
request -> {
276+
RequestParamsBuilder builder = RequestParamsBuilder.create();
277+
builder.add(request.getName(), "name", PING_AND_WARM_0_PATH_TEMPLATE);
278+
builder.add(
279+
request.getAppProfileId(), "app_profile_id", PING_AND_WARM_1_PATH_TEMPLATE);
280+
return builder.build();
281+
})
282+
.build();
254283
GrpcCallSettings<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse>
255284
readModifyWriteRowTransportSettings =
256285
GrpcCallSettings.<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse>newBuilder()
@@ -287,6 +316,9 @@ protected GrpcBigtableStub(
287316
checkAndMutateRowTransportSettings,
288317
settings.checkAndMutateRowSettings(),
289318
clientContext);
319+
this.pingAndWarmCallable =
320+
callableFactory.createUnaryCallable(
321+
pingAndWarmTransportSettings, settings.pingAndWarmSettings(), clientContext);
290322
this.readModifyWriteRowCallable =
291323
callableFactory.createUnaryCallable(
292324
readModifyWriteRowTransportSettings,
@@ -328,6 +360,11 @@ public ServerStreamingCallable<MutateRowsRequest, MutateRowsResponse> mutateRows
328360
return checkAndMutateRowCallable;
329361
}
330362

363+
@Override
364+
public UnaryCallable<PingAndWarmRequest, PingAndWarmResponse> pingAndWarmCallable() {
365+
return pingAndWarmCallable;
366+
}
367+
331368
@Override
332369
public UnaryCallable<ReadModifyWriteRowRequest, ReadModifyWriteRowResponse>
333370
readModifyWriteRowCallable() {

0 commit comments

Comments
 (0)