Merge branch 'main' into release-please--branches--main--components--…

…spanner
googleapis · Nov 14, 2024 · 39c4a11 · 39c4a11
2 parents cab84d9 + 8ee5d05
commit 39c4a11
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/spanner/session.go b/spanner/session.go
@@ -906,7 +906,10 @@ func (p *sessionPool) createMultiplexedSession() {
 				p.mu.Lock()
 				p.multiplexedSessionCreationError = err
 				p.mu.Unlock()
-				p.mayGetMultiplexedSession <- true
+				select {
+				case p.mayGetMultiplexedSession <- true:
+				case <-c.ctx.Done():
+				}
 				continue
 			}
 			p.sc.executeCreateMultiplexedSession(c.ctx, client, p.sc.md, p)