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

fix: avoid session leak on transaction retry (#300) #301

Merged
merged 2 commits into from
Oct 7, 2024
Merged

fix: avoid session leak on transaction retry (#300) #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e39ec1d
fix: avoid session leak on transaction retry (#300)
thepaul Oct 4, 2024
927706e
test: add tests and a TODO
olavloite Oct 7, 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
26 changes: 16 additions & 10 deletions aborted_transactions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"database/sql"
"reflect"
"testing"
"time"

"cloud.google.com/go/spanner"
sppb "cloud.google.com/go/spanner/apiv1/spannerpb"
Expand All @@ -31,10 +32,11 @@ import (
func TestCommitAborted(t *testing.T) {
t.Parallel()

db, server, teardown := setupTestDBConnection(t)
db, server, teardown := setupTestDBConnectionWithParams(t, "minSessions=1;maxSessions=1")
defer teardown()

ctx := context.Background()
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
tx, err := db.BeginTx(ctx, &sql.TxOptions{})
if err != nil {
t.Fatalf("begin failed: %v", err)
Expand All @@ -56,10 +58,11 @@ func TestCommitAborted(t *testing.T) {
func TestCommitAbortedWithInternalRetriesDisabled(t *testing.T) {
t.Parallel()

db, server, teardown := setupTestDBConnectionWithParams(t, "retryAbortsInternally=false")
db, server, teardown := setupTestDBConnectionWithParams(t, "retryAbortsInternally=false;minSessions=1;maxSessions=1")
defer teardown()

ctx := context.Background()
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
tx, err := db.BeginTx(ctx, &sql.TxOptions{})
if err != nil {
t.Fatalf("begin failed: %v", err)
Expand All @@ -82,10 +85,11 @@ func TestCommitAbortedWithInternalRetriesDisabled(t *testing.T) {
func TestUpdateAborted(t *testing.T) {
t.Parallel()

db, server, teardown := setupTestDBConnection(t)
db, server, teardown := setupTestDBConnectionWithParams(t, "minSessions=1;maxSessions=1")
defer teardown()

ctx := context.Background()
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
tx, err := db.BeginTx(ctx, &sql.TxOptions{})
if err != nil {
t.Fatalf("begin failed: %v", err)
Expand Down Expand Up @@ -122,10 +126,11 @@ func TestUpdateAborted(t *testing.T) {
func TestBatchUpdateAborted(t *testing.T) {
t.Parallel()

db, server, teardown := setupTestDBConnection(t)
db, server, teardown := setupTestDBConnectionWithParams(t, "minSessions=1;maxSessions=1")
defer teardown()

ctx := context.Background()
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
tx, err := db.BeginTx(ctx, &sql.TxOptions{})
if err != nil {
t.Fatalf("begin failed: %v", err)
Expand Down Expand Up @@ -359,13 +364,14 @@ func testRetryReadWriteTransactionWithQuery(t *testing.T, setupServer func(serve

t.Parallel()

db, server, teardown := setupTestDBConnection(t)
db, server, teardown := setupTestDBConnectionWithParams(t, "minSessions=1;maxSessions=1")
defer teardown()

if setupServer != nil {
setupServer(server.TestSpanner)
}
ctx := context.Background()
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
tx, err := db.BeginTx(ctx, &sql.TxOptions{})
if err != nil {
t.Fatalf("begin failed: %v", err)
Expand Down
4 changes: 4 additions & 0 deletions transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,10 @@ func (tx *readWriteTransaction) runWithRetry(ctx context.Context, f func(ctx con
// retry retries the entire read/write transaction on a new Spanner transaction.
// It will return ErrAbortedDueToConcurrentModification if the retry fails.
func (tx *readWriteTransaction) retry(ctx context.Context) (err error) {
// TODO: This should use t.ResetForRetry(ctx) instead when that function is available.
if tx.rwTx != nil {
tx.rwTx.Rollback(tx.ctx)
}
tx.rwTx, err = spanner.NewReadWriteStmtBasedTransaction(ctx, tx.client)
if err != nil {
return err
Expand Down
Loading