Skip to content

[scd] Fix missing transaction timeout in SCD datastore #1402

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

Open
ashishjsharda wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[scd] Fix missing transaction timeout in SCD datastore #1402

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions pkg/scd/store/datastore/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package datastore

import (
"context"
"time"

"github.com/cockroachdb/cockroach-go/v2/crdb"
crdbpgx "github.com/cockroachdb/cockroach-go/v2/crdb/crdbpgxv5"
Expand All @@ -25,6 +26,11 @@ var (
// DefaultClock is what is used as the Store's clock, returned from Dial.
DefaultClock = clockwork.NewRealClock()

// DefaultTimeout is the timeout applied to the txn retrier.
// If a given deadline is already supplied on the context, the earlier
// deadline is used.
DefaultTimeout = 10 * time.Second

// DatabaseName is the name of database storing strategic conflict detection data.
DatabaseName = "scd"
)
Expand Down Expand Up @@ -92,6 +98,9 @@ func (s *Store) Interact(_ context.Context) (repos.Repository, error) {

// Transact implements store.Transactor interface.
func (s *Store) Transact(ctx context.Context, f func(context.Context, repos.Repository) error) error {
ctx, cancel := context.WithTimeout(ctx, DefaultTimeout)
defer cancel()

ctx = crdb.WithMaxRetries(ctx, flags.ConnectParameters().MaxRetries)
return crdbpgx.ExecuteTx(ctx, s.db.Pool, pgx.TxOptions{IsoLevel: pgx.Serializable}, func(tx pgx.Tx) error {
return f(ctx, &repo{
Expand Down
Loading