Skip to content

test: fix flaky vip_java_bigtable test #2116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mutianf merged 1 commit into from
Feb 23, 2024
Merged

test: fix flaky vip_java_bigtable test #2116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions ...le-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/RetryInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public class RetryInfoTest {
private BigtableDataSettings.Builder settings;

private AtomicInteger attemptCounter = new AtomicInteger();
private com.google.protobuf.Duration delay =
private com.google.protobuf.Duration defaultDelay =
com.google.protobuf.Duration.newBuilder().setSeconds(2).setNanos(0).build();

@Before
Expand Down Expand Up @@ -328,7 +328,7 @@ public void testCheckAndMutateDisableRetryInfo() throws IOException {
settings.stubSettings().setEnableRetryInfo(false);

try (BigtableDataClient client = BigtableDataClient.create(settings.build())) {
ApiException exception = enqueueNonRetryableExceptionWithDelay(delay);
ApiException exception = enqueueNonRetryableExceptionWithDelay(defaultDelay);
try {
client.checkAndMutateRow(
ConditionalRowMutation.create("table", "key")
Expand Down Expand Up @@ -382,7 +382,7 @@ public void testReadModifyWriteDisableRetryInfo() throws IOException {
settings.stubSettings().setEnableRetryInfo(false);

try (BigtableDataClient client = BigtableDataClient.create(settings.build())) {
ApiException exception = enqueueNonRetryableExceptionWithDelay(delay);
ApiException exception = enqueueNonRetryableExceptionWithDelay(defaultDelay);
try {
client.readModifyWriteRow(ReadModifyWriteRow.create("table", "row").append("cf", "q", "v"));
} catch (ApiException e) {
Expand Down Expand Up @@ -460,7 +460,8 @@ public void testReadChangeStreamNotReturningRetryInfoClientDisabledHandling() th
.readChangeStream(ReadChangeStreamQuery.create("table"))
.iterator()
.hasNext(),
true);
true,
com.google.protobuf.Duration.newBuilder().setSeconds(5).setNanos(0).build());
}
}

Expand Down Expand Up @@ -507,30 +508,30 @@ public void testGenerateInitialChangeStreamServerNotReturningRetryInfoClientDisa
// Test the case where server returns retry info and client enables handling of retry info
private void verifyRetryInfoIsUsed(Runnable runnable, boolean retryableError) {
if (retryableError) {
enqueueRetryableExceptionWithDelay(delay);
enqueueRetryableExceptionWithDelay(defaultDelay);
} else {
enqueueNonRetryableExceptionWithDelay(delay);
enqueueNonRetryableExceptionWithDelay(defaultDelay);
}
Stopwatch stopwatch = Stopwatch.createStarted();
runnable.run();
stopwatch.stop();

assertThat(attemptCounter.get()).isEqualTo(2);
assertThat(stopwatch.elapsed()).isAtLeast(Duration.ofSeconds(delay.getSeconds()));
assertThat(stopwatch.elapsed()).isAtLeast(Duration.ofSeconds(defaultDelay.getSeconds()));
}

// Test the case where server returns retry info but client disabled handling of retry info
private void verifyRetryInfoCanBeDisabled(Runnable runnable) {
enqueueRetryableExceptionWithDelay(delay);
enqueueRetryableExceptionWithDelay(defaultDelay);
Stopwatch stopwatch = Stopwatch.createStarted();
runnable.run();
stopwatch.stop();

assertThat(attemptCounter.get()).isEqualTo(2);
assertThat(stopwatch.elapsed()).isLessThan(Duration.ofSeconds(delay.getSeconds()));
assertThat(stopwatch.elapsed()).isLessThan(Duration.ofSeconds(defaultDelay.getSeconds()));

attemptCounter.set(0);
ApiException expectedApiException = enqueueNonRetryableExceptionWithDelay(delay);
ApiException expectedApiException = enqueueNonRetryableExceptionWithDelay(defaultDelay);
ApiException actualException =
assertThrows("non retryable operations should fail", ApiException.class, runnable::run);
if (actualException instanceof MutateRowsException) {
Expand All @@ -549,6 +550,12 @@ private void verifyRetryInfoCanBeDisabled(Runnable runnable) {

// Test the case where server does not return retry info
private void verifyNoRetryInfo(Runnable runnable, boolean operationRetryable) {
verifyNoRetryInfo(runnable, operationRetryable, defaultDelay);
}

// individual test can override the default delay
private void verifyNoRetryInfo(
Runnable runnable, boolean operationRetryable, com.google.protobuf.Duration delay) {
enqueueRetryableExceptionNoRetryInfo();

if (!operationRetryable) {
Expand Down