Skip to content

test: unflake RetryOnInvalidatedSessionTest #3579

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
wants to merge 2 commits into from
Closed

test: unflake RetryOnInvalidatedSessionTest #3579

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
142cb0a
test: unflake RetryOnInvalidatedSessionTest
rahul2393 Jan 3, 2025
ea33efd
chore: generate libraries at Fri Jan 3 03:25:16 UTC 2025
cloud-java-bot Jan 3, 2025
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
52 changes: 30 additions & 22 deletions ...e-cloud-spanner/src/test/java/com/google/cloud/spanner/RetryOnInvalidatedSessionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Supplier;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
Expand Down Expand Up @@ -205,33 +206,40 @@ public static void stopServer() throws InterruptedException {

@Before
public void setUp() throws InterruptedException {
// Reset the mock Spanner service to ensure a clean state for each test.
mockSpanner.reset();
if (spanner == null
|| spanner.getOptions().getSessionPoolOptions().isFailIfSessionNotFound()
!= failOnInvalidatedSession) {
if (spanner != null) {
spanner.close();
}
SessionPoolOptions.Builder builder = SessionPoolOptions.newBuilder().setFailOnSessionLeak();
if (failOnInvalidatedSession) {
builder.setFailIfSessionNotFound();
}
// This prevents repeated retries for a large number of sessions in the pool.
builder.setMinSessions(1);
SessionPoolOptions sessionPoolOptions = builder.build();
spanner =
SpannerOptions.newBuilder()
.setProjectId("[PROJECT]")
.setChannelProvider(channelProvider)
.setSessionPoolOption(sessionPoolOptions)
.setCredentials(NoCredentials.getInstance())
.build()
.getService();
client = spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"));

// Create a new Spanner instance for each test to ensure session isolation.
SessionPoolOptions.Builder builder = SessionPoolOptions.newBuilder().setFailOnSessionLeak();
if (failOnInvalidatedSession) {
builder.setFailIfSessionNotFound();
}
builder.setMinSessions(1); // Ensure a minimum number of sessions are available.
SessionPoolOptions sessionPoolOptions = builder.build();

spanner =
SpannerOptions.newBuilder()
.setProjectId("[PROJECT]")
.setChannelProvider(channelProvider)
.setSessionPoolOption(sessionPoolOptions)
.setCredentials(NoCredentials.getInstance())
.build()
.getService();

client = spanner.getDatabaseClient(DatabaseId.of("[PROJECT]", "[INSTANCE]", "[DATABASE]"));

// Invalidate the session pool to ensure no sessions are reused.
invalidateSessionPool(client, spanner.getOptions().getSessionPoolOptions().getMinSessions());
}

@After
public void tearDown() {
// Close the Spanner instance to release all sessions.
if (spanner != null) {
spanner.close();
}
}

private static void invalidateSessionPool(DatabaseClient client, int minSessions)
throws InterruptedException {
// Wait for all sessions to have been created, and then delete them.
Expand Down
Loading