Skip to content
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

Jump to bottom

chore: fix session acquire timeout test #2793

Merged
merged 4 commits into from
Feb 7, 2024
Merged

chore: fix session acquire timeout test #2793

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26253d7
chore: fix session acquire timeout test
olavloite Jan 20, 2024
6deaf70
chore: address review comments
olavloite Feb 6, 2024
b10c5f1
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Feb 6, 2024
bc2b7d5
Merge branch 'main' into fix-session-timeout-test
olavloite Feb 6, 2024
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
17 changes: 10 additions & 7 deletions 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 @@ -1166,8 +1166,8 @@ public void blockAndTimeoutOnPoolExhaustion() throws Exception {
latch.await();
// Wait until the request has timed out.
int waitCount = 0;
while (pool.getNumWaiterTimeouts() == 0L && waitCount < 1000) {
Thread.sleep(5L);
while (pool.getNumWaiterTimeouts() == 0L && waitCount < 5000) {
Thread.sleep(1L);
waitCount++;
}
// Return the checked out session to the pool so the async request will get a session and
Expand Down Expand Up @@ -1214,8 +1214,8 @@ public void blockAndTimeoutOnPoolExhaustion_withAcquireSessionTimeout() throws E
latch.await();
// Wait until the request has timed out.
int waitCount = 0;
while (pool.getNumWaiterTimeouts() == 0L && waitCount < 1000) {
Thread.sleep(5L);
while (pool.getNumWaiterTimeouts() == 0L && waitCount < 5000) {
Thread.sleep(1L);
waitCount++;
}
// Return the checked out session to the pool so the async request will get a session and
Expand Down Expand Up @@ -1639,15 +1639,16 @@ public void testSessionNotFoundPartitionedUpdate() {
assertThat(impl.executePartitionedUpdate(statement)).isEqualTo(1L);
}

@SuppressWarnings("rawtypes")
@Test
public void testSessionMetrics() throws Exception {
// Create a session pool with max 2 session and a low timeout for waiting for a session.
options =
SessionPoolOptions.newBuilder()
.setMinSessions(1)
.setMaxSessions(2)
.setMaxIdleSessions(0)
.setInitialWaitForSessionTimeoutMillis(50L)
.setAcquireSessionTimeout(null)
harshachinta marked this conversation as resolved.
Show resolved Hide resolved
.build();
FakeClock clock = new FakeClock();
clock.currentTimeMillis.set(System.currentTimeMillis());
Expand Down Expand Up @@ -1746,10 +1747,12 @@ public void testSessionMetrics() throws Exception {
latch.await();
// Wait until the request has timed out.
int waitCount = 0;
while (pool.getNumWaiterTimeouts() == 0L && waitCount < 1000) {
Thread.sleep(5L);
while (pool.getNumWaiterTimeouts() == 0L && waitCount < 5000) {
harshachinta marked this conversation as resolved.
Show resolved Hide resolved
//noinspection BusyWait
Thread.sleep(1L);
waitCount++;
}
assertTrue(pool.getNumWaiterTimeouts() > 0L);
// Return the checked out session to the pool so the async request will get a session and
// finish.
session2.close();
Expand Down
Loading