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

genesis-test: Create DB snapshot using full tx isolation #298

Merged
merged 1 commit into from
Jan 30, 2023
Merged

genesis-test: Create DB snapshot using full tx isolation #298

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions storage/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ type QueryResults = pgx.Rows
// QueryResult represents the result from a read query.
type QueryResult = pgx.Row

// TxOptions encodes the way DB transactions are executed.
type TxOptions = pgx.TxOptions

// Queue adds query to a batch.
func (b *QueryBatch) Queue(cmd string, args ...interface{}) {
b.items = append(b.items, &batchItem{
Expand Down Expand Up @@ -283,6 +286,9 @@ type TargetStorage interface {
// SendBatch sends a batch of queries to be applied to target storage.
SendBatch(ctx context.Context, batch *QueryBatch) error

// SendBatchWithOptions is like SendBatch, with custom DB options (e.g. level of tx isolation).
SendBatchWithOptions(ctx context.Context, batch *QueryBatch, opts TxOptions) error

// Query submits a query to fetch data from target storage.
Query(ctx context.Context, sql string, args ...interface{}) (QueryResults, error)

Expand Down
6 changes: 5 additions & 1 deletion storage/postgres/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,12 @@ func NewClient(connString string, l *log.Logger) (*Client, error) {
// by any indexer. We only care about atomic success or failure of the batch of queries
// corresponding to a new block.
func (c *Client) SendBatch(ctx context.Context, batch *storage.QueryBatch) error {
return c.SendBatchWithOptions(ctx, batch, pgx.TxOptions{})
}

func (c *Client) SendBatchWithOptions(ctx context.Context, batch *storage.QueryBatch, opts pgx.TxOptions) error {
pgxBatch := batch.AsPgxBatch()
if err := c.pool.BeginTxFunc(ctx, pgx.TxOptions{}, func(tx pgx.Tx) error {
if err := c.pool.BeginTxFunc(ctx, opts, func(tx pgx.Tx) error {
batchResults := tx.SendBatch(ctx, &pgxBatch)
defer common.CloseOrLog(batchResults, c.logger)
for i := 0; i < pgxBatch.Len(); i++ {
Expand Down
6 changes: 5 additions & 1 deletion tests/genesis/genesis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"testing"

"github.com/iancoleman/strcase"
"github.com/jackc/pgx/v4"
"github.com/oasisprotocol/oasis-core/go/common/entity"
"github.com/oasisprotocol/oasis-core/go/common/node"
genesisAPI "github.com/oasisprotocol/oasis-core/go/genesis/api"
Expand Down Expand Up @@ -147,7 +148,10 @@ func checkpointBackends(t *testing.T, source *oasis.ConsensusClient, target *pos
ON CONFLICT DO NOTHING;
`, chainID, chainID))

if err := target.SendBatch(ctx, batch); err != nil {
// Create the snapshot using a high level of isolation; we don't want another
// tx to be able to modify the tables while this is running, creating a snapshot that
// represents indexer state at two (or more) blockchain heights.
if err := target.SendBatchWithOptions(ctx, batch, pgx.TxOptions{IsoLevel: pgx.Serializable}); err != nil {
return 0, err
}

Expand Down