Skip to content

Commit 1cd66a2

Browse files
noahdietzhengfengli
noahdietz
authored and
hengfengli
committed
fix: apply SpannerOptionsTest patch (#332)
1 parent b17177f commit 1cd66a2

File tree

1 file changed

+118
-39
lines changed

1 file changed

+118
-39
lines changed

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java‎

Lines changed: 118 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void builder() {
8181

8282
@Test
8383
public void testSpannerDefaultRetrySettings() {
84-
RetrySettings defaultRetrySettings =
84+
RetrySettings witRetryPolicy1 =
8585
RetrySettings.newBuilder()
8686
.setInitialRetryDelay(Duration.ofMillis(250L))
8787
.setRetryDelayMultiplier(1.3)
@@ -91,55 +91,66 @@ public void testSpannerDefaultRetrySettings() {
9191
.setMaxRpcTimeout(Duration.ofMillis(3600000L))
9292
.setTotalTimeout(Duration.ofMillis(3600000L))
9393
.build();
94-
RetrySettings streamingRetrySettings =
94+
RetrySettings witRetryPolicy2 =
9595
RetrySettings.newBuilder()
9696
.setInitialRetryDelay(Duration.ofMillis(250L))
9797
.setRetryDelayMultiplier(1.3)
9898
.setMaxRetryDelay(Duration.ofMillis(32000L))
99-
.setInitialRpcTimeout(Duration.ofMillis(3600000L))
99+
.setInitialRpcTimeout(Duration.ofMillis(60000L))
100100
.setRpcTimeoutMultiplier(1.0)
101-
.setMaxRpcTimeout(Duration.ofMillis(3600000L))
102-
.setTotalTimeout(Duration.ofMillis(3600000L))
101+
.setMaxRpcTimeout(Duration.ofMillis(60000L))
102+
.setTotalTimeout(Duration.ofMillis(60000L))
103103
.build();
104-
RetrySettings longRunningRetrySettings =
104+
RetrySettings witRetryPolicy3 =
105105
RetrySettings.newBuilder()
106106
.setInitialRetryDelay(Duration.ofMillis(250L))
107107
.setRetryDelayMultiplier(1.3)
108108
.setMaxRetryDelay(Duration.ofMillis(32000L))
109+
.setInitialRpcTimeout(Duration.ofMillis(30000L))
110+
.setRpcTimeoutMultiplier(1.0)
111+
.setMaxRpcTimeout(Duration.ofMillis(30000L))
112+
.setTotalTimeout(Duration.ofMillis(30000L))
113+
.build();
114+
RetrySettings noRetry1 =
115+
RetrySettings.newBuilder()
109116
.setInitialRpcTimeout(Duration.ofMillis(3600000L))
110117
.setRpcTimeoutMultiplier(1.0)
111118
.setMaxRpcTimeout(Duration.ofMillis(3600000L))
112119
.setTotalTimeout(Duration.ofMillis(3600000L))
113120
.build();
114121
SpannerOptions options = SpannerOptions.newBuilder().setProjectId("test-project").build();
115122
SpannerStubSettings stubSettings = options.getSpannerStubSettings();
116-
List<? extends UnaryCallSettings<?, ?>> callsWithDefaultSettings =
123+
List<? extends UnaryCallSettings<?, ?>> callsWithRetry1 =
124+
Arrays.asList(stubSettings.listSessionsSettings(), stubSettings.commitSettings());
125+
List<? extends UnaryCallSettings<?, ?>> callsWithRetry2 =
126+
Arrays.asList(stubSettings.batchCreateSessionsSettings());
127+
List<? extends UnaryCallSettings<?, ?>> callsWithRetry3 =
117128
Arrays.asList(
118-
stubSettings.beginTransactionSettings(),
119129
stubSettings.createSessionSettings(),
130+
stubSettings.getSessionSettings(),
120131
stubSettings.deleteSessionSettings(),
121-
stubSettings.executeBatchDmlSettings(),
122132
stubSettings.executeSqlSettings(),
123-
stubSettings.getSessionSettings(),
124-
stubSettings.listSessionsSettings(),
125-
stubSettings.partitionQuerySettings(),
126-
stubSettings.partitionReadSettings(),
133+
stubSettings.executeBatchDmlSettings(),
127134
stubSettings.readSettings(),
128-
stubSettings.rollbackSettings());
129-
List<? extends ServerStreamingCallSettings<?, ?>> callsWithStreamingSettings =
135+
stubSettings.beginTransactionSettings(),
136+
stubSettings.rollbackSettings(),
137+
stubSettings.partitionQuerySettings(),
138+
stubSettings.partitionReadSettings());
139+
List<? extends ServerStreamingCallSettings<?, ?>> callsWithNoRetry1 =
130140
Arrays.asList(
131141
stubSettings.executeStreamingSqlSettings(), stubSettings.streamingReadSettings());
132-
List<? extends UnaryCallSettings<?, ?>> callsWithLongRunningSettings =
133-
Arrays.asList(stubSettings.commitSettings());
134142

135-
for (UnaryCallSettings<?, ?> callSettings : callsWithDefaultSettings) {
136-
assertThat(callSettings.getRetrySettings()).isEqualTo(defaultRetrySettings);
143+
for (UnaryCallSettings<?, ?> callSettings : callsWithRetry1) {
144+
assertThat(callSettings.getRetrySettings()).isEqualTo(witRetryPolicy1);
137145
}
138-
for (ServerStreamingCallSettings<?, ?> callSettings : callsWithStreamingSettings) {
139-
assertThat(callSettings.getRetrySettings()).isEqualTo(streamingRetrySettings);
146+
for (UnaryCallSettings<?, ?> callSettings : callsWithRetry2) {
147+
assertThat(callSettings.getRetrySettings()).isEqualTo(witRetryPolicy2);
140148
}
141-
for (UnaryCallSettings<?, ?> callSettings : callsWithLongRunningSettings) {
142-
assertThat(callSettings.getRetrySettings()).isEqualTo(longRunningRetrySettings);
149+
for (UnaryCallSettings<?, ?> callSettings : callsWithRetry3) {
150+
assertThat(callSettings.getRetrySettings()).isEqualTo(witRetryPolicy3);
151+
}
152+
for (ServerStreamingCallSettings<?, ?> callSettings : callsWithNoRetry1) {
153+
assertThat(callSettings.getRetrySettings()).isEqualTo(noRetry1);
143154
}
144155
}
145156

@@ -213,26 +224,54 @@ public void testSpannerCustomRetrySettings() {
213224

214225
@Test
215226
public void testDatabaseAdminDefaultRetrySettings() {
216-
RetrySettings defaultRetrySettings =
227+
RetrySettings withRetryPolicy1 =
217228
RetrySettings.newBuilder()
218229
.setInitialRetryDelay(Duration.ofMillis(1000L))
219230
.setRetryDelayMultiplier(1.3)
220231
.setMaxRetryDelay(Duration.ofMillis(32000L))
221-
.setInitialRpcTimeout(Duration.ofMillis(60000L))
232+
.setInitialRpcTimeout(Duration.ofMillis(3600000L))
222233
.setRpcTimeoutMultiplier(1.0)
223-
.setMaxRpcTimeout(Duration.ofMillis(60000L))
224-
.setTotalTimeout(Duration.ofMillis(600000L))
234+
.setMaxRpcTimeout(Duration.ofMillis(3600000L))
235+
.setTotalTimeout(Duration.ofMillis(3600000L))
236+
.build();
237+
RetrySettings withRetryPolicy2 =
238+
RetrySettings.newBuilder()
239+
.setInitialRetryDelay(Duration.ofMillis(1000L))
240+
.setRetryDelayMultiplier(1.3)
241+
.setMaxRetryDelay(Duration.ofMillis(32000L))
242+
.setInitialRpcTimeout(Duration.ofMillis(30000L))
243+
.setRpcTimeoutMultiplier(1.0)
244+
.setMaxRpcTimeout(Duration.ofMillis(30000L))
245+
.setTotalTimeout(Duration.ofMillis(30000L))
246+
.build();
247+
RetrySettings noRetryPolicy2 =
248+
RetrySettings.newBuilder()
249+
.setInitialRpcTimeout(Duration.ofMillis(30000L))
250+
.setRpcTimeoutMultiplier(1.0)
251+
.setMaxRpcTimeout(Duration.ofMillis(30000L))
252+
.setTotalTimeout(Duration.ofMillis(30000L))
225253
.build();
226254
SpannerOptions options = SpannerOptions.newBuilder().setProjectId("test-project").build();
227255
DatabaseAdminStubSettings stubSettings = options.getDatabaseAdminStubSettings();
228-
List<? extends UnaryCallSettings<?, ?>> callsWithDefaultSettings =
256+
List<? extends UnaryCallSettings<?, ?>> callsWithRetryPolicy1 =
229257
Arrays.asList(
230258
stubSettings.dropDatabaseSettings(),
231-
stubSettings.getDatabaseDdlSettings(),
232-
stubSettings.getDatabaseSettings());
259+
stubSettings.getDatabaseSettings(),
260+
stubSettings.getDatabaseDdlSettings());
261+
List<? extends UnaryCallSettings<?, ?>> callsWithRetryPolicy2 =
262+
Arrays.asList(stubSettings.getIamPolicySettings());
263+
List<? extends UnaryCallSettings<?, ?>> callsWithNoRetry2 =
264+
Arrays.asList(
265+
stubSettings.setIamPolicySettings(), stubSettings.testIamPermissionsSettings());
233266

234-
for (UnaryCallSettings<?, ?> callSettings : callsWithDefaultSettings) {
235-
assertThat(callSettings.getRetrySettings()).isEqualTo(defaultRetrySettings);
267+
for (UnaryCallSettings<?, ?> callSettings : callsWithRetryPolicy1) {
268+
assertThat(callSettings.getRetrySettings()).isEqualTo(withRetryPolicy1);
269+
}
270+
for (UnaryCallSettings<?, ?> callSettings : callsWithRetryPolicy2) {
271+
assertThat(callSettings.getRetrySettings()).isEqualTo(withRetryPolicy2);
272+
}
273+
for (UnaryCallSettings<?, ?> callSettings : callsWithNoRetry2) {
274+
assertThat(callSettings.getRetrySettings()).isEqualTo(noRetryPolicy2);
236275
}
237276
}
238277

@@ -275,28 +314,68 @@ public void testDatabaseAdminCustomRetrySettings() {
275314

276315
@Test
277316
public void testInstanceAdminDefaultRetrySettings() {
278-
RetrySettings defaultRetrySettings =
317+
RetrySettings withRetryPolicy1 =
279318
RetrySettings.newBuilder()
280319
.setInitialRetryDelay(Duration.ofMillis(1000L))
281320
.setRetryDelayMultiplier(1.3)
282321
.setMaxRetryDelay(Duration.ofMillis(32000L))
283-
.setInitialRpcTimeout(Duration.ofMillis(60000L))
322+
.setInitialRpcTimeout(Duration.ofMillis(3600000L))
284323
.setRpcTimeoutMultiplier(1.0)
285-
.setMaxRpcTimeout(Duration.ofMillis(60000L))
286-
.setTotalTimeout(Duration.ofMillis(600000L))
324+
.setMaxRpcTimeout(Duration.ofMillis(3600000L))
325+
.setTotalTimeout(Duration.ofMillis(3600000L))
326+
.build();
327+
RetrySettings withRetryPolicy2 =
328+
RetrySettings.newBuilder()
329+
.setInitialRetryDelay(Duration.ofMillis(1000L))
330+
.setRetryDelayMultiplier(1.3)
331+
.setMaxRetryDelay(Duration.ofMillis(32000L))
332+
.setInitialRpcTimeout(Duration.ofMillis(30000L))
333+
.setRpcTimeoutMultiplier(1.0)
334+
.setMaxRpcTimeout(Duration.ofMillis(30000L))
335+
.setTotalTimeout(Duration.ofMillis(30000L))
336+
.build();
337+
RetrySettings noRetryPolicy1 =
338+
RetrySettings.newBuilder()
339+
.setInitialRpcTimeout(Duration.ofMillis(3600000L))
340+
.setRpcTimeoutMultiplier(1.0)
341+
.setMaxRpcTimeout(Duration.ofMillis(3600000L))
342+
.setTotalTimeout(Duration.ofMillis(3600000L))
343+
.build();
344+
RetrySettings noRetryPolicy2 =
345+
RetrySettings.newBuilder()
346+
.setInitialRpcTimeout(Duration.ofMillis(30000L))
347+
.setRpcTimeoutMultiplier(1.0)
348+
.setMaxRpcTimeout(Duration.ofMillis(30000L))
349+
.setTotalTimeout(Duration.ofMillis(30000L))
287350
.build();
288351
SpannerOptions options = SpannerOptions.newBuilder().setProjectId("test-project").build();
289352
InstanceAdminStubSettings stubSettings = options.getInstanceAdminStubSettings();
290-
List<? extends UnaryCallSettings<?, ?>> callsWithDefaultSettings =
353+
List<? extends UnaryCallSettings<?, ?>> callsWithRetryPolicy1 =
291354
Arrays.asList(
292355
stubSettings.getInstanceConfigSettings(),
293356
stubSettings.listInstanceConfigsSettings(),
294357
stubSettings.deleteInstanceSettings(),
295358
stubSettings.getInstanceSettings(),
296359
stubSettings.listInstancesSettings());
360+
List<? extends UnaryCallSettings<?, ?>> callsWithRetryPolicy2 =
361+
Arrays.asList(stubSettings.getIamPolicySettings());
362+
List<? extends UnaryCallSettings<?, ?>> callsWithNoRetryPolicy1 =
363+
Arrays.asList(stubSettings.createInstanceSettings(), stubSettings.updateInstanceSettings());
364+
List<? extends UnaryCallSettings<?, ?>> callsWithNoRetryPolicy2 =
365+
Arrays.asList(
366+
stubSettings.setIamPolicySettings(), stubSettings.testIamPermissionsSettings());
297367

298-
for (UnaryCallSettings<?, ?> callSettings : callsWithDefaultSettings) {
299-
assertThat(callSettings.getRetrySettings()).isEqualTo(defaultRetrySettings);
368+
for (UnaryCallSettings<?, ?> callSettings : callsWithRetryPolicy1) {
369+
assertThat(callSettings.getRetrySettings()).isEqualTo(withRetryPolicy1);
370+
}
371+
for (UnaryCallSettings<?, ?> callSettings : callsWithRetryPolicy2) {
372+
assertThat(callSettings.getRetrySettings()).isEqualTo(withRetryPolicy2);
373+
}
374+
for (UnaryCallSettings<?, ?> callSettings : callsWithNoRetryPolicy1) {
375+
assertThat(callSettings.getRetrySettings()).isEqualTo(noRetryPolicy1);
376+
}
377+
for (UnaryCallSettings<?, ?> callSettings : callsWithNoRetryPolicy2) {
378+
assertThat(callSettings.getRetrySettings()).isEqualTo(noRetryPolicy2);
300379
}
301380
}
302381

0 commit comments

Comments
 (0)