fix(spanner): destroy session when client is closing (#6700)

* fix(spanner): destroy session when client is closing. * fix test
googleapis · Sep 21, 2022 · a1ce541 · a1ce541
1 parent 37d209c
commit a1ce541
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/spanner/session.go b/spanner/session.go
@@ -25,6 +25,7 @@ import (
 	"math"
 	"math/rand"
 	"runtime/debug"
+	"strings"
 	"sync"
 	"time"
 
@@ -1723,3 +1724,12 @@ func isSessionNotFoundError(err error) bool {
 	}
 	return false
 }
+
+// isClientClosing returns true if the given error is a
+// `Connection is closing` error.
+func isClientClosing(err error) bool {
+	if err == nil {
+		return false
+	}
+	return ErrCode(err) == codes.Canceled && strings.Contains(err.Error(), "the client connection is closing")
+}
diff --git a/spanner/transaction.go b/spanner/transaction.go
@@ -779,7 +779,7 @@ func (t *ReadOnlyTransaction) release(err error) {
 	sh := t.sh
 	t.mu.Unlock()
 	if sh != nil { // sh could be nil if t.acquire() fails.
-		if isSessionNotFoundError(err) {
+		if isSessionNotFoundError(err) || isClientClosing(err) {
 			sh.destroy()
 		}
 		if t.singleUse {