Skip to content
This repository was archived by the owner on May 8, 2026. It is now read-only.

test: deflake stub test #2769

Merged
gcf-merge-on-green merged 6 commits into from
Feb 3, 2026
Merged

test: deflake stub test #2769

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47cdf61
test: deflake context propagation test
igorbernstein2 Feb 2, 2026
e1f40c9
chore: generate libraries at Mon Feb 2 19:18:29 UTC 2026
cloud-java-bot Feb 2, 2026
5d2f2b9
revert retry settings in context
igorbernstein2 Feb 2, 2026
0e93b29
format
igorbernstein2 Feb 2, 2026
2061fe1
format
igorbernstein2 Feb 2, 2026
5921b1c
chore: generate libraries at Tue Feb 3 17:48:35 UTC 2026
cloud-java-bot Feb 3, 2026
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
41 changes: 35 additions & 6 deletions ...gtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import com.google.api.gax.grpc.GaxGrpcProperties;
import com.google.api.gax.grpc.GrpcCallContext;
import com.google.api.gax.grpc.GrpcTransportChannel;
import com.google.api.gax.retrying.RetrySettings;
import com.google.api.gax.rpc.FailedPreconditionException;
import com.google.api.gax.rpc.FixedTransportChannelProvider;
import com.google.api.gax.rpc.InstantiatingWatchdogProvider;
Expand Down Expand Up @@ -110,6 +111,7 @@
import io.grpc.ManagedChannelBuilder;
import io.grpc.Metadata;
import io.grpc.Metadata.Key;
import io.grpc.MethodDescriptor;
import io.grpc.Server;
import io.grpc.ServerCall;
import io.grpc.ServerCall.Listener;
Expand Down Expand Up @@ -708,7 +710,10 @@ public void testCallContextPropagatedInMutationBatcher()

// Override the timeout
GrpcCallContext clientCtx =
GrpcCallContext.createDefault().withTimeout(Duration.ofMinutes(10));
GrpcCallContext.createDefault()
.withTimeout(Duration.ofMinutes(10))
.withRetrySettings(
RetrySettings.newBuilder().setTotalTimeout(Duration.ofMinutes(10)).build());

// Send a batch
try (Batcher<RowMutationEntry, Void> batcher =
Expand All @@ -717,7 +722,7 @@ public void testCallContextPropagatedInMutationBatcher()
}

// Ensure that the server got the overriden deadline
Context serverCtx = contextInterceptor.contexts.poll();
Context serverCtx = contextInterceptor.pollContext(BigtableGrpc.getMutateRowsMethod());
assertThat(serverCtx).isNotNull();
assertThat(serverCtx.getDeadline()).isAtLeast(Deadline.after(8, TimeUnit.MINUTES));
}
Expand All @@ -738,7 +743,10 @@ public void testCallContextPropagatedInReadBatcher()

// Override the timeout
GrpcCallContext clientCtx =
GrpcCallContext.createDefault().withTimeout(Duration.ofMinutes(10));
GrpcCallContext.createDefault()
.withTimeout(Duration.ofMinutes(10))
.withRetrySettings(
RetrySettings.newBuilder().setTotalTimeout(Duration.ofMinutes(10)).build());
Comment thread
igorbernstein2 marked this conversation as resolved.
Outdated

// Send a batch
try (Batcher<ByteString, Row> batcher =
Expand All @@ -747,7 +755,7 @@ public void testCallContextPropagatedInReadBatcher()
}

// Ensure that the server got the overriden deadline
Context serverCtx = contextInterceptor.contexts.poll();
Context serverCtx = contextInterceptor.pollContext(BigtableGrpc.getReadRowsMethod());
assertThat(serverCtx).isNotNull();
assertThat(serverCtx.getDeadline()).isAtLeast(Deadline.after(8, TimeUnit.MINUTES));
}
Expand Down Expand Up @@ -970,16 +978,37 @@ public <ReqT, RespT> Listener<ReqT> interceptCall(
}

private static class ContextInterceptor implements ServerInterceptor {
final BlockingQueue<Context> contexts = Queues.newLinkedBlockingDeque();
final BlockingQueue<MethodContext> contexts = Queues.newLinkedBlockingDeque();

static class MethodContext {
final MethodDescriptor<?, ?> method;
final Context context;

MethodContext(MethodDescriptor<?, ?> method, Context context) {
this.method = method;
this.context = context;
}
}

@Override
public <ReqT, RespT> Listener<ReqT> interceptCall(
ServerCall<ReqT, RespT> serverCall,
Metadata metadata,
ServerCallHandler<ReqT, RespT> serverCallHandler) {
contexts.add(Context.current());
contexts.add(new MethodContext(serverCall.getMethodDescriptor(), Context.current()));
return serverCallHandler.startCall(serverCall, metadata);
}

Context pollContext(MethodDescriptor<?, ?> method) {
ContextInterceptor.MethodContext methodContext = contexts.poll();
while (methodContext != null) {
if (method.equals(methodContext.method)) {
return methodContext.context;
}
methodContext = contexts.poll();
}
return null;
}
}

private static class FakeDataService extends BigtableGrpc.BigtableImplBase {
Expand Down
Loading