Skip to content

Spanner: Unflake SessionPoolTest #6174

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

Closed
olavloite wants to merge 1 commit into from
Closed

Spanner: Unflake SessionPoolTest #6174

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
7 changes: 7 additions & 0 deletions ...-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.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.cloud.spanner.spi.v1.SpannerRpc;
import com.google.cloud.spanner.spi.v1.SpannerRpc.ResultStreamConsumer;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import com.google.common.util.concurrent.Uninterruptibles;
import com.google.protobuf.ByteString;
import com.google.spanner.v1.CommitRequest;
Expand Down Expand Up @@ -626,12 +627,16 @@ public void export(Collection<SpanData> spanDataList) {
Session checkedOutSession = pool.getReadSession();
final Boolean finWrite = write;
ExecutorService executor = Executors.newFixedThreadPool(1);
// Setup a flag that will indicate when the thread will start waiting for a session to prevent
// flaky fails if it takes some time before the thread is started.
final SettableFuture<Boolean> waitingForSession = SettableFuture.create();
Future<Void> fut =
executor.submit(
new Callable<Void>() {
@Override
public Void call() throws Exception {
Session session;
waitingForSession.set(Boolean.TRUE);
if (finWrite) {
session = pool.getReadWriteSession();
} else {
Expand All @@ -642,6 +647,8 @@ public Void call() throws Exception {
}
});
try {
// Wait until the background thread is actually waiting for a session.
waitingForSession.get();
fut.get(80L, TimeUnit.MILLISECONDS);
fail("missing expected timeout exception");
} catch (TimeoutException e) {
Expand Down