fix failing tests

googleapis · Jun 27, 2024 · 837ea3b · 837ea3b
1 parent 6ad748f
commit 837ea3b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/spanner/session.go b/spanner/session.go
@@ -1152,8 +1152,10 @@ func (p *sessionPool) remove(s *session, isExpire bool) bool {
 	if s.invalidate() {
 		// Decrease the number of opened sessions.
 		p.numOpened--
-		// Decrease the number of sessions in use.
-		p.decNumInUseLocked(ctx)
+		// Decrease the number of sessions in use, only when not from idle list.
+		if !isExpire {
+			p.decNumInUseLocked(ctx)
+		}
 		p.recordStat(ctx, OpenSessionCount, int64(p.numOpened))
 		// Broadcast that a session has been destroyed.
 		close(p.mayGetSession)

diff --git a/spanner/session_test.go b/spanner/session_test.go
@@ -1049,7 +1049,13 @@ func TestPositiveNumInUseSessions(t *testing.T) {
 		sh.recycle()
 	}
 
-	for sp.idleList.Len() != 1 {
+	for true {
+		sp.mu.Lock()
+		if sp.idleList.Len() == 1 {
+			sp.mu.Unlock()
+			break
+		}
+		sp.mu.Unlock()
 		continue
 	}
 	sp.mu.Lock()